Add tdbg dlq merge for v2 #5025
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
MichaelSnowden
force-pushed
the
snowden/dlq-purge
branch
from
265942d
to
4d9e4b1
Compare
MichaelSnowden
force-pushed
the
snowden/dlq-merge
branch
from
344d55d
to
c20f37f
Compare
yycptt
approved these changes
Oct 25, 2023
| response, err := adminClient.MergeDLQTasks(ctx, &adminservice.MergeDLQTasksRequest{ | ||
| DlqKey: ac.getDLQKey(), | ||
| InclusiveMaxTaskMetadata: &commonspb.HistoryDLQTaskMetadata{ | ||
| MessageId: lastMessageID, |
There was a problem hiding this comment.
just to confirm I can specify MaxInt64 here if I want all tasks merged?
There was a problem hiding this comment.
That's a good idea. I added that as the default behavior behind a confirmation flag. I also extracted the prompter logic into an object and added unit tests for it. Lastly, I added documentation for the behavior of the last-message-id flag.
service/frontend/admin_handler.go
Outdated
| return fmt.Sprintf("manage-dlq-tasks-%s", key.GetQueueName()) | ||
| } | ||
|
|
||
| func (adh *AdminHandler) parseKey(key *commonspb.HistoryDLQKey) (*persistence.QueueKey, error) { |
There was a problem hiding this comment.
Yeah, that makes more sense.
service/worker/dlq/workflow.go
Outdated
| return err | ||
| } | ||
| ctx = workflow.WithActivityOptions(ctx, workflow.ActivityOptions{ |
There was a problem hiding this comment.
shall we add a retry policy for those activities?
There was a problem hiding this comment.
Done, please let me know if you think this retry policy is reasonable.
MichaelSnowden
force-pushed
the
snowden/dlq-purge
branch
from
4d9e4b1
to
930c529
Compare
MichaelSnowden
force-pushed
the
snowden/dlq-merge
branch
3 times, most recently
from
132d45b
to
9867700
Compare
MichaelSnowden
force-pushed
the
snowden/dlq-merge
branch
from
9867700
to
dff5f14
Compare
MichaelSnowden
force-pushed
the
snowden/dlq-purge
branch
from
930c529
to
2da103b
Compare
MichaelSnowden
force-pushed
the
snowden/dlq-merge
branch
5 times, most recently
from
ba51661
to
d546ba9
Compare
MichaelSnowden
force-pushed
the
snowden/dlq-merge
branch
from
d546ba9
to
222d411
Compare
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.
What changed?
This PR adds support for
--dlq-version v2to thetdbg dlq mergecommand.Why?
Admins need this to be able to re-enqueue tasks.
How did you test it?
I added an end-to-end test with a real workflow which does this:
I also added various unit tests for parameter validation and control flow to get 100% test coverage.
Note that this won't work for cross-cluster tasks yet. I will add that and update the history replication DLQ integration test as well in a follow-up.
Potential risks
Is hotfix candidate?