Skip to content

Fix Migrate() hang on panic abort during throttling #1677

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.

Sign up for GitHub

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

Open
jakubpliszka wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −4
Open

Fix Migrate() hang on panic abort during throttling #1677

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b88c52
Handle context cancellation in consumeRowCopyComplete to prevent dead…
jakubpliszka May 15, 2026
9055b4e
Merge branch 'master' into jakubpliszka/fix-panic-deadlock-during-thr…
jakubpliszka May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions go/logic/migrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,16 @@ func (mgtr *Migrator) retryOperationWithExponentialBackoff(operation func() erro
// consumeRowCopyComplete blocks on the rowCopyComplete channel once, and then
// consumes and drops any further incoming events that may be left hanging.
func (mgtr *Migrator) consumeRowCopyComplete() {
if err := <-mgtr.rowCopyComplete; err != nil {
// Abort synchronously to ensure checkAbort() sees the error immediately
mgtr.abort(err)
// Don't mark row copy as complete if there was an error
select {
case err := <-mgtr.rowCopyComplete:
if err != nil {
// Abort synchronously to ensure checkAbort() sees the error immediately
mgtr.abort(err)
// Don't mark row copy as complete if there was an error
return
}
case <-mgtr.migrationContext.GetContext().Done():
// Abort cancelled the context
return
}
atomic.StoreInt64(&mgtr.rowCopyCompleteFlag, 1)
Expand Down
Loading