-
Notifications
You must be signed in to change notification settings - Fork 910
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Priority-enabled TaskMatcher #7196
Merged
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0c8fbc3
Fix flaky TestTransitionFromActivity (#7132)
ShahabT 21503b7
fix flaky xdc test TestCronWorkflowCompleteAndFailover (#7139)
hai719 a2d0e4c
taskmatcher rewrite wip
dnr 4f0ce0b
redo userdata changed stuff and some other review comments
dnr bf4e406
some more review comments
dnr 1798f6c
move new matcher/taskReader to new files and make switchable by config
dnr acf80f6
add a few more tweaks
dnr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // The MIT License | ||
| // | ||
| // Copyright (c) 2025 Temporal Technologies Inc. All rights reserved. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| package matching | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| "github.com/emirpasic/gods/maps/treemap" | ||
| godsutils "github.com/emirpasic/gods/utils" | ||
| "google.golang.org/protobuf/types/known/timestamppb" | ||
| ) | ||
|
|
||
| const emptyBacklogAge time.Duration = -1 | ||
|
|
||
| // backlogAgeTracker is not safe for concurrent use | ||
| type backlogAgeTracker struct { | ||
| tree treemap.Map // unix nano as int64 -> int (count) | ||
| } | ||
|
|
||
| func newBacklogAgeTracker() backlogAgeTracker { | ||
| return backlogAgeTracker{tree: *treemap.NewWith(godsutils.Int64Comparator)} | ||
| } | ||
|
|
||
| // record adds or removes a task from the tracker. | ||
| func (b backlogAgeTracker) record(ts *timestamppb.Timestamp, delta int) { | ||
| if ts == nil { | ||
| return | ||
| } | ||
|
|
||
| createTime := ts.AsTime().UnixNano() | ||
| count := delta | ||
| if prev, ok := b.tree.Get(createTime); ok { | ||
| count += prev.(int) | ||
| } | ||
| if count = max(0, count); count == 0 { | ||
| b.tree.Remove(createTime) | ||
| } else { | ||
| b.tree.Put(createTime, count) | ||
| } | ||
| } | ||
|
|
||
| // getBacklogAge returns the largest age in this backlog (age of oldest task), | ||
| // or emptyBacklogAge if empty. | ||
| func (b backlogAgeTracker) getAge() time.Duration { | ||
| if b.tree.Empty() { | ||
| return emptyBacklogAge | ||
| } | ||
| k, _ := b.tree.Min() | ||
| oldest := k.(int64) | ||
| return time.Since(time.Unix(0, oldest)) | ||
| } | ||
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is treemap thread safe?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, backlogAgeTracker is not thread safe (commented on line 35), the owner has to synchronize access. The philosophy of the new matcher is to put everything under one lock per matcher (1:1 with partition), to simplify code and reduce overhead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So this method needs to be called under a lock? I think we need to use convention like methodLocked() to indicate a method needs to be called with lock obtained.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For structs that have both locked and unlocked methods, maybe. This is just a simple data structure. The whole thing is either thread-safe or not. For comparison, maps and slices are not thread-safe and the functions that manipulate them in the stdlib
mapsandslicespackages don't have any special annotations, it's understood that synchronization is the responsibility of the caller.