Skip to content

Small fixes in move-tables config initialization #1712

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

Merged
danieljoos merged 1 commit into from
Jun 17, 2026
Merged

Small fixes in move-tables config initialization #1712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions go/base/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,8 +983,14 @@ func (mctx *MigrationContext) ApplyCredentials() {
Hostname: mctx.MoveTables.TargetHost,
Port: mctx.MoveTables.TargetPort,
})
mctx.MoveTables.ConnectionConfig.User = mctx.MoveTables.TargetUser
mctx.MoveTables.ConnectionConfig.Password = mctx.MoveTables.TargetPass
if mctx.MoveTables.TargetUser != "" {
// Override
mctx.MoveTables.ConnectionConfig.User = mctx.MoveTables.TargetUser
}
if mctx.MoveTables.TargetPass != "" {
Comment on lines +986 to +990
// Override
mctx.MoveTables.ConnectionConfig.Password = mctx.MoveTables.TargetPass
}
}
}

Expand Down
7 changes: 0 additions & 7 deletions go/cmd/gh-ost/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,13 +383,6 @@ func main() {
// For now, we only support moving a single table at a time.
log.Fatal("--move-tables currently supports only a single table")
}

if migrationContext.MoveTables.TargetUser == "" {
migrationContext.MoveTables.TargetUser = migrationContext.CliUser
}
if migrationContext.MoveTables.TargetPass == "" {
migrationContext.MoveTables.TargetPass = migrationContext.CliPassword
}
if migrationContext.MoveTables.TargetDatabase == "" {
migrationContext.MoveTables.TargetDatabase = migrationContext.DatabaseName
}
Expand Down
4 changes: 2 additions & 2 deletions go/logic/applier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,11 @@ func buildMigrationLockName(db, table string) string {
// preventing two gh-ost processes from migrating the same table concurrently
// on the same MySQL server.
func (apl *Applier) AcquireMigrationLock(ctx context.Context) error {
lockName := buildMigrationLockName(apl.migrationContext.DatabaseName, apl.originalTableName())
lockName := buildMigrationLockName(apl.migrationContext.GetTargetDatabaseName(), apl.originalTableName())

// Use a dedicated *sql.DB so the pinned connection does not consume a
// slot in apl.db's small pool (mysql.MaxDBPoolConnections).
lockURI := apl.connectionConfig.GetDBUri(apl.migrationContext.DatabaseName)
lockURI := apl.connectionConfig.GetDBUri(apl.migrationContext.GetTargetDatabaseName())
lockDB, err := gosql.Open("mysql", lockURI)
if err != nil {
return fmt.Errorf("failed to open migration lock DB: %w", err)
Expand Down
Loading