Add GET_LOCK to prevent concurrent migrations of the same table#1693
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a MySQL user-level GET_LOCK taken on a dedicated pinned connection at the start of initiateApplier() to prevent two gh-ost processes from concurrently migrating the same table on the same MySQL server. A keepalive goroutine pings the pinned connection and triggers PanicAbort if the connection dies; the lock is released in Applier.Teardown().
Changes:
- New
AcquireMigrationLock/releaseMigrationLockplus a keepalive goroutine inApplier, called fromMigrator.initiateApplier()and released viaApplier.Teardown(). - Lock name
gh-ost::<db>.<table>(SHA1-hashed if it exceeds MySQL's 64-char limit) computed bybuildMigrationLockName. - New testcontainer-backed tests for acquire-when-free and acquire-when-held, a unit test for
buildMigrationLockName, and addeddefer migrator.applier.Teardown()in migrator copier tests.
Show a summary per file
| File | Description |
|---|---|
| go/logic/applier.go | Adds migration-wide GET_LOCK infrastructure (pinned conn, keepalive, release) and wires release into Teardown. |
| go/logic/migrator.go | Acquires the migration lock immediately after InitDBConnections in initiateApplier. |
| go/logic/applier_test.go | Adds integration tests for lock acquisition success/failure and a unit test for the lock-name builder. |
| go/logic/migrator_test.go | Ensures applier is torn down after initiateApplier() in copier tests so the new lock connection is released. |
Copilot's findings
Tip
Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Files reviewed: 4/4 changed files
- Comments generated: 0
meiji163
approved these changes
May 28, 2026
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 prevents two gh-ost processes from migrating the same table concurrently on the same MySQL server.
The existing table existence check runs only on fresh start, and is defeated by the dummy-drop-and-retry recovery flow when the previous gh-ost is still alive.
initiateAppliernow takesGET_LOCK('gh-ost::<db>.<table>', 0)on a pinned connection. The lock survives table cleanup, auto-releases on TCP close so retries work, and a keepalive triggersPanicAbortif the connection dies.script/cibuildreturns with no formatting errors, build errors or unit test errors.