fix: add backoff to retry loops - #24653
Merged
mergify[bot] merged 5 commits intoMay 28, 2026
Merged
Conversation
Qodo reviews are paused for this user.Troubleshooting steps vary by plan Learn more → On a Teams plan? Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center? |
mergify
Bot
added
kind/bug
1 task
There was a problem hiding this comment.
Pull request overview
Adds capped exponential backoff to three previously busy-spin retry loops: remote lock table unlock/getLock and txn service parallelSendWithRetry. The parallelSendWithRetry path is also made context-aware so cancellation exits promptly. Targeted unit tests cover the backoff doubling/cap and cancellation behavior. As noted in the PR description, the lockop budget=0 change from #24107 is intentionally not reapplied because main already classifies ErrLockTableBindChanged as a bounded retry error.
Changes:
- Add exponential backoff (100ms → 5s) to
remoteLockTable.unlockandgetLockretry loops, preserving the no-error unlock contract. - Add context-aware exponential backoff (100ms → 1s) to
service.parallelSendWithRetry, returning nil promptly on ctx cancel. - Add unit tests for backoff doubling/cap, get-lock retry path, and cancellation-during-backoff behavior.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| pkg/lockservice/lock_table_remote.go | Adds package-level backoff knobs and helpers; inserts sleep+next-backoff into the unlock and getLock retry loops. |
| pkg/lockservice/lock_table_remote_test.go | New tests verifying nextRemoteRetryBackoff doubling/cap and a successful retry path for getLock after an RPC timeout. |
| pkg/txn/service/service.go | Adds context-aware backoff wait and next-backoff helpers; applies them to parallelSendWithRetry send failures; resets backoff after a successful send. |
| pkg/txn/service/service_test.go | Adds a stub retryTestSender and tests that parallelSendWithRetry exits during backoff on cancel and returns nil when ctx is already canceled. |
XuPeng-SH
approved these changes
May 28, 2026
iamlinjunhong
approved these changes
May 28, 2026
Contributor
Merge Queue Status
This pull request spent 1 hour 3 minutes 31 seconds in the queue, including 1 hour 2 minutes 22 seconds running CI. Required conditions to merge
|
This file contains hidden or 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
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 type of PR is this?
Which issue(s) this PR fixes:
issue #24654
What this PR does / why we need it:
This ports the still-needed retry-loop fixes from the closed PR #24107 to current main.
The lockop budget=0 change from #24107 is intentionally not reapplied because current main already treats ErrLockTableBindChanged as a bounded retry error.
Tests:
Note: the lockservice test was run outside the sandbox because it needs to bind unix sockets.