stash

Author: chriskirkland

.gitignore

@@ -4,3 +4,7 @@
 /.vendor/
 .idea/
 *.tmp
+
+tools/
+*__failpoint_binding__.go
+*.go__failpoint_stash__

go/base/context.go

@@ -22,9 +22,10 @@ import (
 	"github.com/github/gh-ost/go/metrics"
 	"github.com/github/gh-ost/go/mysql"
 	"github.com/github/gh-ost/go/sql"
-	"github.com/openark/golib/log"
 
 	"github.com/go-ini/ini"
+	"github.com/openark/golib/log"
+	"github.com/pingcap/failpoint"
 )
 
 // RowsEstimateMethod is the type of row number estimation
@@ -1152,3 +1153,14 @@ func SendWithContext[T any](ctx context.Context, ch chan<- T, val T) error {
 		return ctx.Err()
 	}
 }
+
+func (mctx *MigrationContext) NewFailPoint(name string) {
+	if mctx.UnsafeFailPointsEnabled {
+		mctx.Log.Debugf("Injecting fail point: %s", name)
+
+		failpoint.Inject(name, func(val failpoint.Value) {
+			mctx.Log.Debugf("Encountered fail point: %s", name)
+			panic(fmt.Sprintf("encountered fail point: '%s'", name))
+		})
+	}
+}

go/logic/applier.go

@@ -29,6 +29,7 @@ import (
 	"github.com/github/gh-ost/go/mysql"
 	drivermysql "github.com/go-sql-driver/mysql"
 	"github.com/openark/golib/sqlutils"
+	"github.com/pingcap/failpoint"
 )
 
 const (
@@ -1451,6 +1452,17 @@ func (apl *Applier) ApplyIterationInsertQuery() (chunkSize int64, rowsAffected i
 // ApplyIterationMoveTableCopyQueries issues a SELECT query on the original table and an INSERT query on the target table,
 // copying a chunk of rows. It is used when `--move-tables` is specified, instead of ApplyIterationInsertQuery.
 func (apl *Applier) ApplyIterationMoveTableCopyQueries(sourceDB *gosql.DB) (chunkSize int64, rowsAffected int64, duration time.Duration, err error) {
+	//apl.migrationContext.NewFailPoint("panic-on-row-copy")
+	if apl.migrationContext.UnsafeFailPointsEnabled {
+		name := "panic-on-row-copy"
+		apl.migrationContext.Log.Debugf("Injecting fail point: %s", name)
+
+		failpoint.Inject(name, func(val failpoint.Value) {
+			apl.migrationContext.Log.Debugf("Encountered fail point: %s", name)
+			panic(fmt.Sprintf("encountered fail point: '%s'", name))
+		})
+	}
+
 	startTime := time.Now()
 	chunkSize = atomic.LoadInt64(&apl.migrationContext.ChunkSize)
 	if sourceDB == nil {

go/logic/migrator.go

@@ -21,8 +21,6 @@ import (
 	"github.com/github/gh-ost/go/binlog"
 	"github.com/github/gh-ost/go/mysql"
 	"github.com/github/gh-ost/go/sql"
-
-	"github.com/pingcap/failpoint"
 )
 
 var (
@@ -2871,13 +2869,3 @@ func (mgtr *Migrator) teardown() {
 		mgtr.sourcePrimaryDB.Close()
 	}
 }
-
-func (mgtr *Migrator) newFailPoint(name string) {
-	if mgtr.migrationContext.UnsafeFailPointsEnabled {
-		mgtr.migrationContext.Log.Debugf("Injecting fail point: %s", name)
-
-		failpoint.Inject(name, func(val failpoint.Value) {
-			panic(fmt.Sprintf("encountered fail point: '%s'", name))
-		})
-	}
-}

localtests/move-tables-test.sh

@@ -38,6 +38,7 @@ original_sql_mode=
 current_gtid_mode=
 test_timeout=120
 test_failure_log_tail_lines=50
+tables_to_migrate=()
 
 OPTIND=1
 while getopts "b:s:dg" OPTION; do
@@ -177,8 +178,16 @@ build_ghost_command() {
     # Build gh-ost command with all standard options
     #
     # expected $1 to be a comma-separated list of tables to move
-    cmd="GOTRACEBACK=crash $ghost_binary \
-    --move-tables=$1 \
+
+    # build comma-separated list of tables to move
+    move_tables_arg=$(IFS=, ; echo "${tables_to_migrate[*]}")
+
+    # NOTE(chriskirkland): fully qualified package name + failpoint name
+    FAILPOINT="github.com/github/gh-ost/go/logic/panic-on-row-copy=return(true)"
+    cmd="GOTRACEBACK=crash \
+    GO_FAILPOINTS='github.com/github/gh-ost/go/logic/panic-on-row-copy=return(true)' \
+    $ghost_binary \
+    --move-tables=$move_tables_arg \
     --user=root \
     --password=opensesame \
     --host=$source_replica_host \
@@ -199,6 +208,7 @@ build_ghost_command() {
     --stack \
     --checkpoint \
     --postpone-cut-over-flag-file=$postpone_cutover_flag_file \
+    --unsafe-fail-points-enabled \
     --execute ${extra_args[@]}"
 }
 
@@ -371,8 +381,7 @@ test_single() {
     ) &
 
     # Build and execute gh-ost command
-    move_tables_arg=$(IFS=, ; echo "${tables_to_migrate[*]}")
-    build_ghost_command "$move_tables_arg"
+    build_ghost_command
     echo_dot
     echo $cmd >$exec_command_file
     echo_dot