reorder

Signed-off-by: Tim Vaillancourt <[email protected]>

Author: timvaillancourt

go/logic/applier.go

@@ -940,7 +940,7 @@ func (this *Applier) CreateAtomicCutOverSentryTable() error {
 // InitAtomicCutOverWaitTimeout sets the cut-over session wait_timeout in order to reduce the
 // time an unresponsive (but still connected) gh-ost process can hold the cut-over lock.
 func (this *Applier) InitAtomicCutOverWaitTimeout(tx *gosql.Tx) error {
-	cutOverWaitTimeoutSeconds := this.migrationContext.CutOverLockTimeoutSeconds * 2
+	cutOverWaitTimeoutSeconds := this.migrationContext.CutOverLockTimeoutSeconds * 3
 	this.migrationContext.Log.Infof("Setting cut-over idle timeout as %d seconds", cutOverWaitTimeoutSeconds)
 	query := fmt.Sprintf(`set /* gh-ost */ session wait_timeout:=%d`, cutOverWaitTimeoutSeconds)
 	_, err := tx.Exec(query)
@@ -998,16 +998,16 @@ func (this *Applier) AtomicCutOverMagicLock(sessionIdChan chan int64, tableLocke
 		return err
 	}
 
-	if err := this.InitAtomicCutOverWaitTimeout(tx); err != nil {
+	if err := this.CreateAtomicCutOverSentryTable(); err != nil {
 		tableLocked <- err
 		return err
 	}
-	defer this.RevertAtomicCutOverWaitTimeout()
 
-	if err := this.CreateAtomicCutOverSentryTable(); err != nil {
+	if err := this.InitAtomicCutOverWaitTimeout(tx); err != nil {
 		tableLocked <- err
 		return err
 	}
+	defer this.RevertAtomicCutOverWaitTimeout()
 
 	query = fmt.Sprintf(`lock /* gh-ost */ tables %s.%s write, %s.%s write`,
 		sql.EscapeName(this.migrationContext.DatabaseName),