octoleo/gh-ost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert out of scope change

Browse Source
This commit is contained in:
Tim Vaillancourt 2022-06-05 00:06:41 +02:00
parent af99b247f9
commit ec199f1185
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
go/logic/migrator.go
View File

@ -537,20 +537,19 @@ func (this *Migrator) cutOver() (err error) {
} }
} }
} }
if this.migrationContext.CutOverType == base.CutOverAtomic {
switch this.migrationContext.CutOverType {
case base.CutOverAtomic:
// Atomic solution: we use low timeout and multiple attempts. But for // Atomic solution: we use low timeout and multiple attempts. But for
// each failed attempt, we throttle until replication lag is back to normal // each failed attempt, we throttle until replication lag is back to normal
err = this.atomicCutOver() err := this.atomicCutOver()
case base.CutOverTwoStep: this.handleCutOverResult(err)
err = this.cutOverTwoStep() return err
default:
return this.migrationContext.Log.Fatalf("Unknown cut-over type: %d; should never get here!", this.migrationContext.CutOverType)
} }
if this.migrationContext.CutOverType == base.CutOverTwoStep {
this.handleCutOverResult(err) err := this.cutOverTwoStep()
return err this.handleCutOverResult(err)
return err
}
return this.migrationContext.Log.Fatalf("Unknown cut-over type: %d; should never get here!", this.migrationContext.CutOverType)
} }
// Inject the "AllEventsUpToLockProcessed" state hint, wait for it to appear in the binary logs, // Inject the "AllEventsUpToLockProcessed" state hint, wait for it to appear in the binary logs,