Fix Migrate() hang on panic abort during throttling#1677
Open
jakubpliszka wants to merge 2 commits into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a hang in Migrator.consumeRowCopyComplete() that occurred when gh-ost was panic-aborted during throttling. Previously, the function blocked unconditionally on rowCopyComplete, so if the abort path drained/cancelled the migration before any value was sent on that channel, teardown could never proceed. The fix wraps the receive in a select that also returns when the migration context is cancelled.
Changes:
- Make
consumeRowCopyComplete()context-aware viaselectonrowCopyCompleteandmigrationContext.GetContext().Done(). - Preserve existing behavior of calling
mgtr.abort(err)and returning without marking row copy complete on error.
Show a summary per file
| File | Description |
|---|---|
| go/logic/migrator.go | Adds a context-cancellation case to the initial receive in consumeRowCopyComplete() so it unblocks on abort. |
Copilot's findings
Tip
Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Files reviewed: 1/1 changed files
- Comments generated: 0
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.
Description
This PR makes
consumeRowCopyComplete()context aware so it always unblocks and exits cleanly on abort.When gh-ost is panic aborted while throttled, the migration never exits because
consumeRowCopyComplete()blocks forever waiting onrowCopyComplete. This happens when context cancellation causes the completion signal to be dropped, leaving teardown and shutdown logic unreachable.script/cibuildreturns with no formatting errors, build errors or unit test errors.