schedule: let merge not easy to timeout #1495
Merged
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 problem does this PR solve?
merge operator may timeout easily cause the merge operator timeout span is calculated as LeaderOperatorWaitTime.
What is changed and how it works?
For merge schedule, there will be two operators created. One for the source region (op1), the other for the target region (op2). And cause source region will be destroyed and there will be no heartbeat of it anymore, so op1 will never be finished, instead, it will be cleaned up in the PD background thread. So the op2 is the operator to detect when the merge process finished. But op2 has no steps like
AddPeer
,RemovePeer
, so its timeout is always regarded asLeaderOperatorWaitTime
.This PR makes op2 have the same operator kinds as op1.
Check List