func rename

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

Author: timvaillancourt

go/logic/applier.go

@@ -937,18 +937,18 @@ func (this *Applier) CreateAtomicCutOverSentryTable() error {
 	return nil
 }
 
-// InitAtomicCutOverIdleTimeout sets the cut-over session wait_timeout in order to reduce the
+// 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) InitAtomicCutOverIdleTimeout(tx *gosql.Tx) error {
-	cutOverIdleTimeoutSeconds := this.migrationContext.CutOverLockTimeoutSeconds * 2
-	this.migrationContext.Log.Infof("Setting cut-over idle timeout as %d seconds", cutOverIdleTimeoutSeconds)
-	query := fmt.Sprintf(`set /* gh-ost */ session wait_timeout:=%d`, cutOverIdleTimeoutSeconds)
+func (this *Applier) InitAtomicCutOverWaitTimeout(tx *gosql.Tx) error {
+	cutOverWaitTimeoutSeconds := this.migrationContext.CutOverLockTimeoutSeconds * 2
+	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)
 	return err
 }
 
-// RevertAtomicCutOverIdleTimeout restores the original wait_timeout for the applier session post-cut-over.
-func (this *Applier) RevertAtomicCutOverIdleTimeout() {
+// RevertAtomicCutOverWaitTimeout restores the original wait_timeout for the applier session post-cut-over.
+func (this *Applier) RevertAtomicCutOverWaitTimeout() {
 	this.migrationContext.Log.Infof("Reverting cut-over idle timeout to %d seconds", this.migrationContext.ApplierWaitTimeout)
 	query := fmt.Sprintf(`set /* gh-ost */ session wait_timeout:=%d`, this.migrationContext.ApplierWaitTimeout)
 	if _, err := sqlutils.ExecNoPrepare(this.db, query); err != nil {
@@ -998,11 +998,11 @@ func (this *Applier) AtomicCutOverMagicLock(sessionIdChan chan int64, tableLocke
 		return err
 	}
 
-	if err := this.InitAtomicCutOverIdleTimeout(tx); err != nil {
+	if err := this.InitAtomicCutOverWaitTimeout(tx); err != nil {
 		tableLocked <- err
 		return err
 	}
-	defer this.RevertAtomicCutOverIdleTimeout()
+	defer this.RevertAtomicCutOverWaitTimeout()
 
 	if err := this.CreateAtomicCutOverSentryTable(); err != nil {
 		tableLocked <- err