Adapt to v15

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
vitessio · Sep 7, 2023 · ce145e7 · ce145e7
1 parent eb94b0f
commit ce145e7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 46 deletions.
diff --git a/go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go b/go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go
@@ -41,9 +41,8 @@ var (
 	shards          []cluster.Shard
 	vtParams        mysql.ConnParams
 
-	normalWaitTime            = 20 * time.Second
-	extendedWaitTime          = 60 * time.Second
-	ensureStateNotChangedTime = 5 * time.Second
+	normalWaitTime   = 20 * time.Second
+	extendedWaitTime = 60 * time.Second
 
 	hostname              = "localhost"
 	keyspaceName          = "ks"
@@ -80,9 +79,6 @@ var (
 	trivialAlterT2Statement = `
 		ALTER TABLE t2_test ENGINE=InnoDB;
 	`
-	instantAlterT1Statement = `
-		ALTER TABLE t1_test ADD COLUMN i0 INT NOT NULL DEFAULT 0;
-	`
 	dropT1Statement = `
 		DROP TABLE IF EXISTS t1_test
 	`
@@ -161,32 +157,10 @@ func TestMain(m *testing.M) {
 }
 
 func TestSchemaChange(t *testing.T) {
-<<<<<<< HEAD
-=======
-
-	throttler.EnableLagThrottlerAndWaitForStatus(t, clusterInstance, time.Second)
-
-	t.Run("scheduler", testScheduler)
-	t.Run("singleton", testSingleton)
-	t.Run("declarative", testDeclarative)
-	t.Run("foreign-keys", testForeignKeys)
-	t.Run("summary: validate sequential migration IDs", func(t *testing.T) {
-		onlineddl.ValidateSequentialMigrationIDs(t, &vtParams, shards)
-	})
-	t.Run("summary: validate completed_timestamp", func(t *testing.T) {
-		onlineddl.ValidateCompletedTimestamp(t, &vtParams)
-	})
-}
-
-func testScheduler(t *testing.T) {
->>>>>>> f71583b6ef (OnlineDDL: fix nil 'completed_timestamp' for cancelled migrations (#13928))
 	defer cluster.PanicHandler(t)
 	shards = clusterInstance.Keyspaces[0].Shards
 	require.Equal(t, 1, len(shards))
 
-	mysqlVersion := onlineddl.GetMySQLVersion(t, clusterInstance.Keyspaces[0].Shards[0].PrimaryTablet())
-	require.NotEmpty(t, mysqlVersion)
-
 	var t1uuid string
 	var t2uuid string
 
@@ -339,7 +313,7 @@ func testScheduler(t *testing.T) {
 			onlineddl.WaitForMigrationStatus(t, &vtParams, shards, t1uuid, normalWaitTime, schema.OnlineDDLStatusRunning)
 			// now that t1 is running, let's unblock t2. We expect it to remain queued.
 			onlineddl.CheckCompleteMigration(t, &vtParams, shards, t2uuid, true)
-			time.Sleep(ensureStateNotChangedTime)
+			time.Sleep(5 * time.Second)
 			// t1 should be still running!
 			onlineddl.CheckMigrationStatus(t, &vtParams, shards, t1uuid, schema.OnlineDDLStatusRunning)
 			// non-concurrent -- should be queued!
@@ -371,7 +345,7 @@ func testScheduler(t *testing.T) {
 		t.Run("expect both running", func(t *testing.T) {
 			onlineddl.WaitForMigrationStatus(t, &vtParams, shards, t1uuid, normalWaitTime, schema.OnlineDDLStatusRunning)
 			onlineddl.WaitForMigrationStatus(t, &vtParams, shards, t2uuid, normalWaitTime, schema.OnlineDDLStatusRunning)
-			time.Sleep(ensureStateNotChangedTime)
+			time.Sleep(5 * time.Second)
 			// both should be still running!
 			onlineddl.CheckMigrationStatus(t, &vtParams, shards, t1uuid, schema.OnlineDDLStatusRunning)
 			onlineddl.CheckMigrationStatus(t, &vtParams, shards, t2uuid, schema.OnlineDDLStatusRunning)
@@ -410,7 +384,7 @@ func testScheduler(t *testing.T) {
 			// since all migrations are throttled, t1 migration is not ready_to_complete, hence
 			// t2 should not be running
 			onlineddl.WaitForMigrationStatus(t, &vtParams, shards, t2uuid, normalWaitTime, schema.OnlineDDLStatusQueued, schema.OnlineDDLStatusReady)
-			time.Sleep(ensureStateNotChangedTime)
+			time.Sleep(5 * time.Second)
 			// both should be still running!
 			onlineddl.CheckMigrationStatus(t, &vtParams, shards, t1uuid, schema.OnlineDDLStatusRunning)
 			onlineddl.CheckMigrationStatus(t, &vtParams, shards, t2uuid, schema.OnlineDDLStatusQueued, schema.OnlineDDLStatusReady)
@@ -419,7 +393,7 @@ func testScheduler(t *testing.T) {
 			onlineddl.UnthrottleAllMigrations(t, &vtParams)
 			// t1 should now be ready_to_complete, hence t2 should start running
 			onlineddl.WaitForMigrationStatus(t, &vtParams, shards, t2uuid, extendedWaitTime, schema.OnlineDDLStatusRunning)
-			time.Sleep(ensureStateNotChangedTime)
+			time.Sleep(5 * time.Second)
 			// both should be still running!
 			onlineddl.CheckMigrationStatus(t, &vtParams, shards, t1uuid, schema.OnlineDDLStatusRunning)
 			onlineddl.CheckMigrationStatus(t, &vtParams, shards, t2uuid, schema.OnlineDDLStatusRunning)
@@ -592,7 +566,7 @@ func testScheduler(t *testing.T) {
 		})
 		drop1uuid := testOnlineDDLStatement(t, dropT1Statement, ddlStrategy+" -allow-concurrent", "vtgate", "", "", true) // skip wait
 		t.Run("t1drop blocked", func(t *testing.T) {
-			time.Sleep(ensureStateNotChangedTime)
+			time.Sleep(5 * time.Second)
 			// drop1 migration should block. It can run concurrently to t1, but conflicts on table name
 			onlineddl.CheckMigrationStatus(t, &vtParams, shards, drop1uuid, schema.OnlineDDLStatusReady)
 		})
@@ -665,6 +639,9 @@ func testScheduler(t *testing.T) {
 			}
 		})
 	})
+	t.Run("summary: validate completed_timestamp", func(t *testing.T) {
+		onlineddl.ValidateCompletedTimestamp(t, &vtParams)
+	})
 }
 
 // testOnlineDDLStatement runs an online DDL, ALTER statement

diff --git a/go/vt/vttablet/onlineddl/executor.go b/go/vt/vttablet/onlineddl/executor.go
@@ -77,7 +77,6 @@ var (
 	ErrMigrationNotFound = errors.New("migration not found")
 )
 
-<<<<<<< HEAD
 var vexecUpdateTemplates = []string{
 	`update _vt.schema_migrations set migration_status='val1' where mysql_schema='val2'`,
 	`update _vt.schema_migrations set migration_status='val1' where migration_uuid='val2' and mysql_schema='val3'`,
@@ -102,15 +101,13 @@ var vexecInsertTemplates = []string{
 		'val1', 'val2', 'val3', 'val4', 'val5', 'val6', 'val7', 'val8', 'val9', FROM_UNIXTIME(0), 'vala', 'valb'
 	)`,
 }
-=======
 var (
 	// fixCompletedTimestampDone fixes a nil `completed_tiemstamp` columns, see
 	// https://github.com/vitessio/vitess/issues/13927
 	// The fix is in release-18.0
 	// TODO: remove in release-19.0
 	fixCompletedTimestampDone bool
 )
->>>>>>> f71583b6ef (OnlineDDL: fix nil 'completed_timestamp' for cancelled migrations (#13928))
 
 var emptyResult = &sqltypes.Result{}
 var acceptableDropTableIfExistsErrorCodes = []int{mysql.ERCantFindFile, mysql.ERNoSuchTable}
@@ -3764,15 +3761,6 @@ func (e *Executor) gcArtifacts(ctx context.Context) error {
 	e.migrationMutex.Lock()
 	defer e.migrationMutex.Unlock()
 
-<<<<<<< HEAD
-	if _, err := e.execQuery(ctx, sqlFixCompletedTimestamp); err != nil {
-		// This query fixes a bug where stale migrations were marked as 'failed' without updating 'completed_timestamp'
-		// see https://github.com/vitessio/vitess/issues/8499
-		// Running this query retroactively sets completed_timestamp
-		// This 'if' clause can be removed in version v13
-		return err
-	}
-=======
 	// v18 fix. Remove in v19
 	if !fixCompletedTimestampDone {
 		if _, err := e.execQuery(ctx, sqlFixCompletedTimestamp); err != nil {
@@ -3784,7 +3772,6 @@ func (e *Executor) gcArtifacts(ctx context.Context) error {
 		fixCompletedTimestampDone = true
 	}
 
->>>>>>> f71583b6ef (OnlineDDL: fix nil 'completed_timestamp' for cancelled migrations (#13928))
 	query, err := sqlparser.ParseAndBind(sqlSelectUncollectedArtifacts,
 		sqltypes.Int64BindVariable(int64((retainOnlineDDLTables).Seconds())),
 	)