Merge pull request #1705 from github/zacharysierakowski/move-tables-1.2

Move Tables: 1.2 skip-tables and run overall move tables flow except cutover (#8206)

Author: zacharysierakowski

go/base/context.go

@@ -398,6 +398,24 @@ func (mctx *MigrationContext) GetGhostTableName() string {
 	}
 }
 
+// GetTargetTableName generates the name of the target table, based on original table name and
+// the migration context (i.e. move-tables mode).
+func (mctx *MigrationContext) GetTargetTableName() string {
+	if mctx.IsMoveTablesMode() {
+		return mctx.MoveTables.TableNames[0]
+	}
+	return mctx.GetGhostTableName()
+}
+
+// GetTargetDatabaseName fetches the name of the target database, which defaults to the original
+// database name unless we're in move-tables mode.
+func (mctx *MigrationContext) GetTargetDatabaseName() string {
+	if mctx.IsMoveTablesMode() {
+		return mctx.MoveTables.TargetDatabase
+	}
+	return mctx.DatabaseName
+}
+
 // GetOldTableName generates the name of the "old" table, into which the original table is renamed.
 func (mctx *MigrationContext) GetOldTableName() string {
 	var tableName string
@@ -939,11 +957,27 @@ func (mctx *MigrationContext) ApplyCredentials() {
 		// Override
 		mctx.InspectorConnectionConfig.Password = mctx.CliPassword
 	}
+
+	if mctx.IsMoveTablesMode() {
+		// Derive the applier config from the inspector config, but point it at
+		// the target host and override credentials from the target CLI args.
+		mctx.MoveTables.ConnectionConfig = mctx.InspectorConnectionConfig.DuplicateCredentials(mysql.InstanceKey{
+			Hostname: mctx.MoveTables.TargetHost,
+			Port:     mctx.MoveTables.TargetPort,
+		})
+		mctx.MoveTables.ConnectionConfig.User = mctx.MoveTables.TargetUser
+		mctx.MoveTables.ConnectionConfig.Password = mctx.MoveTables.TargetPass
+	}
 }
 
 func (mctx *MigrationContext) SetupTLS() error {
 	if mctx.UseTLS {
-		return mctx.InspectorConnectionConfig.UseTLS(mctx.TLSCACertificate, mctx.TLSCertificate, mctx.TLSKey, mctx.TLSAllowInsecure)
+		if err := mctx.InspectorConnectionConfig.UseTLS(mctx.TLSCACertificate, mctx.TLSCertificate, mctx.TLSKey, mctx.TLSAllowInsecure); err != nil {
+			return err
+		}
+		if mctx.IsMoveTablesMode() && mctx.MoveTables.ConnectionConfig != nil {
+			return mctx.MoveTables.ConnectionConfig.UseTLS(mctx.TLSCACertificate, mctx.TLSCertificate, mctx.TLSKey, mctx.TLSAllowInsecure)
+		}
 	}
 	return nil
 }

go/base/context_test.go

@@ -216,6 +216,62 @@ func TestReadConfigFile(t *testing.T) {
 	}
 }
 
+func TestApplyCredentialsMoveTablesDerivesConnectionConfig(t *testing.T) {
+	ctx := NewMigrationContext()
+	ctx.MoveTables.TableNames = []string{"some_table"}
+	ctx.MoveTables.TargetHost = "target-host"
+	ctx.MoveTables.TargetPort = 3307
+	ctx.MoveTables.TargetUser = "target-user"
+	ctx.MoveTables.TargetPass = "target-pass"
+
+	ctx.InspectorConnectionConfig.Key.Hostname = "source-host"
+	ctx.InspectorConnectionConfig.Key.Port = 3306
+	ctx.InspectorConnectionConfig.User = "source-user"
+	ctx.InspectorConnectionConfig.Password = "source-pass"
+	ctx.InspectorConnectionConfig.Timeout = 12.5
+	ctx.InspectorConnectionConfig.TransactionIsolation = "REPEATABLE-READ"
+	ctx.InspectorConnectionConfig.Charset = "utf8mb4"
+
+	ctx.ApplyCredentials()
+
+	got := ctx.MoveTables.ConnectionConfig
+	require.NotNil(t, got)
+	require.Equal(t, "target-host", got.Key.Hostname)
+	require.Equal(t, 3307, got.Key.Port)
+	require.Equal(t, "target-user", got.User)
+	require.Equal(t, "target-pass", got.Password)
+	require.Equal(t, 12.5, got.Timeout)
+	require.Equal(t, "REPEATABLE-READ", got.TransactionIsolation)
+	require.Equal(t, "utf8mb4", got.Charset)
+	require.NotNil(t, got.ImpliedKey)
+	require.Equal(t, "target-host", got.ImpliedKey.Hostname)
+	require.Equal(t, 3307, got.ImpliedKey.Port)
+}
+
+func TestSetupTLSAppliesToMoveTablesConfig(t *testing.T) {
+	ctx := NewMigrationContext()
+	ctx.UseTLS = true
+	ctx.TLSAllowInsecure = true
+	ctx.MoveTables.TableNames = []string{"some_table"}
+	ctx.MoveTables.TargetHost = "target-host"
+	ctx.MoveTables.TargetPort = 3307
+	ctx.MoveTables.TargetUser = "target-user"
+	ctx.MoveTables.TargetPass = "target-pass"
+
+	ctx.InspectorConnectionConfig.Key.Hostname = "source-host"
+	ctx.InspectorConnectionConfig.Key.Port = 3306
+	ctx.InspectorConnectionConfig.User = "source-user"
+	ctx.InspectorConnectionConfig.Password = "source-pass"
+
+	ctx.ApplyCredentials()
+	require.NoError(t, ctx.SetupTLS())
+
+	require.NotNil(t, ctx.InspectorConnectionConfig.TLSConfig())
+	require.NotNil(t, ctx.MoveTables.ConnectionConfig.TLSConfig())
+	require.Equal(t, "source-host", ctx.InspectorConnectionConfig.TLSConfig().ServerName)
+	require.Equal(t, "target-host", ctx.MoveTables.ConnectionConfig.TLSConfig().ServerName)
+}
+
 func TestSetAbortError_StoresFirstError(t *testing.T) {
 	ctx := NewMigrationContext()
 

go/cmd/gh-ost/main.go

@@ -20,6 +20,7 @@ import (
 	"github.com/github/gh-ost/go/base"
 	"github.com/github/gh-ost/go/logic"
 	"github.com/github/gh-ost/go/metrics"
+	"github.com/github/gh-ost/go/mysql"
 	"github.com/github/gh-ost/go/sql"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/openark/golib/log"
@@ -233,12 +234,6 @@ func main() {
 		migrationContext.Log.SetLevel(log.ERROR)
 	}
 
-	if err := migrationContext.SetConnectionConfig(*storageEngine); err != nil {
-		migrationContext.Log.Fatale(err)
-	}
-
-	migrationContext.SetConnectionCharset(*charset)
-
 	if migrationContext.AlterStatement == "" && !migrationContext.Revert && *moveTables == "" {
 		log.Fatal("--alter must be provided and statement must not be empty, or --revert must be used, or --move-tables must be used")
 	}
@@ -379,6 +374,7 @@ func main() {
 			// For now, we only support moving a single table at a time.
 			log.Fatal("--move-tables currently supports only a single table")
 		}
+
 		if migrationContext.MoveTables.TargetUser == "" {
 			migrationContext.MoveTables.TargetUser = migrationContext.CliUser
 		}
@@ -388,8 +384,15 @@ func main() {
 		if migrationContext.MoveTables.TargetDatabase == "" {
 			migrationContext.MoveTables.TargetDatabase = migrationContext.DatabaseName
 		}
+		migrationContext.MoveTables.ConnectionConfig = mysql.NewConnectionConfig()
 	}
 
+	if err := migrationContext.SetConnectionConfig(*storageEngine); err != nil {
+		migrationContext.Log.Fatale(err)
+	}
+
+	migrationContext.SetConnectionCharset(*charset)
+
 	switch *cutOver {
 	case "atomic", "default", "":
 		migrationContext.CutOverType = base.CutOverAtomic