Check for --test-on-replica-skip-replica-stop in cutOver method

Author: pbitty

go/logic/applier.go

@@ -568,15 +568,11 @@ func (this *Applier) StartSlaveSQLThread() error {
 
 // StopReplication is used by `--test-on-replica` and stops replication.
 func (this *Applier) StopReplication() error {
-	if this.migrationContext.TestOnReplicaSkipReplicaStop {
-		log.Warningf("--test-on-replica-skip-replica-stop enabled, we are not stopping replication.")
-	} else {
-		if err := this.StopSlaveIOThread(); err != nil {
-			return err
-		}
-		if err := this.StopSlaveSQLThread(); err != nil {
-			return err
-		}
+	if err := this.StopSlaveIOThread(); err != nil {
+		return err
+	}
+	if err := this.StopSlaveSQLThread(); err != nil {
+		return err
 	}
 
 	readBinlogCoordinates, executeBinlogCoordinates, err := mysql.GetReplicationBinlogCoordinates(this.db)

go/logic/migrator.go

@@ -477,9 +477,14 @@ func (this *Migrator) cutOver() (err error) {
 		// the same cut-over phase as the master would use. That means we take locks
 		// and swap the tables.
 		// The difference is that we will later swap the tables back.
-		log.Debugf("testing on replica. Stopping replication IO thread")
-		if err := this.retryOperation(this.applier.StopReplication); err != nil {
-			return err
+
+		if this.migrationContext.TestOnReplicaSkipReplicaStop {
+			log.Warningf("--test-on-replica-skip-replica-stop enabled, we are not stopping replication.")
+		} else {
+			log.Debugf("testing on replica. Stopping replication IO thread")
+			if err := this.retryOperation(this.applier.StopReplication); err != nil {
+				return err
+			}
 		}
 		// We're merly testing, we don't want to keep this state. Rollback the renames as possible
 		defer this.applier.RenameTablesRollback()