[v8.0] Match all the things #7907
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DIRACGridBot
added
the
alsoTargeting:integration
chrisburr
force-pushed
the
match-all-the-things
branch
5 times, most recently
from
7819a7b to
4ba5244
Compare
chrisburr
force-pushed
the
match-all-the-things
branch
from
4ba5244 to
b10bed7
Compare
chrisburr
commented
Nov 22, 2024
| class Limiter: | ||
| # static variables shared between all instances of this class | ||
| csDictCache = DictCache() | ||
| condCache = DictCache() | ||
| newCache = TwoLevelCache(10, 300) |
There was a problem hiding this comment.
It's probably worth replacing condCache with newCache but I don't have time for it.
fstagni
reviewed
Nov 25, 2024
Comment on lines
+357
to
+358
| data = result["Value"] | ||
| data = {k[0][attName]: k[1] for k in data} |
There was a problem hiding this comment.
Suggested change
| data = result["Value"] | |
| data = {k[0][attName]: k[1] for k in data} | |
| data = {k[0][attName]: k[1] for k in result["Value"]} |
| return result | ||
| # It is critical that ``future`` is waited for outside of the lock as | ||
| # _work aquires the lock before filling the caches. This also means | ||
| # we can gaurentee that the future has not yet been removed from the |
There was a problem hiding this comment.
Suggested change
| # we can gaurentee that the future has not yet been removed from the | |
| # we can guarantee that the future has not yet been removed from the |
| @@ -12,10 +21,109 @@ | |||
| from DIRAC.WorkloadManagementSystem.Client import JobStatus | |||
|
|
|||
|
|
|||
| class TwoLevelCache: | |||
There was a problem hiding this comment.
It does not seem to me there's anything "specific" to this class. What if you move it to a generic utility module?
| self.futures: dict[str, Future] = {} | ||
| self.pool = ThreadPoolExecutor(max_workers=max_workers) | ||
|
|
||
| def get(self, key: str, populate_func: Callable[[], Any]): |
There was a problem hiding this comment.
Suggested change
| def get(self, key: str, populate_func: Callable[[], Any]): | |
| def get(self, key: str, populate_func: Callable[[], Any]) -> dict: |
fstagni
approved these changes
Dec 2, 2024
|
I will merge this one right now, and take care of minor comments (and possibly other usage of the new cache) in a later PR. |
|
Sweep summary Sweep ran in https://github.com/DIRACGrid/DIRAC/actions/runs/12115525328 Successful:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In LHCbDIRAC we found that the matcher was struggling when there are many jobs running at a single site. This was caused by the JobDB being slow to do
select Type, count(*) from Jobs where Site = %(site)s group by Type. Every 10 seconds the cache would expire and every thread would try to query the DB again and hang for a long time.Looking at the culmative response time over a couple of hours (with a similar number of requests in both periods) the new version is 98.9% faster.
Before this change:
After this change:
BEGINRELEASENOTES
*WorkloadManagment
CHANGE: Better caching performance in the Matching Limiter
ENDRELEASENOTES