Skip to content

Commit

Permalink
Removing a specific failing test from the backport. The removed test …
Browse files Browse the repository at this point in the history
…tests '--prefer-instant-ddl', a functionality that was not backported to v15

Signed-off-by: Shlomi Noach <[email protected]>
  • Loading branch information
shlomi-noach committed Aug 24, 2023
1 parent a56d230 commit a8cccdb
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions go/test/endtoend/onlineddl/scheduler/onlineddl_scheduler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ func TestSchemaChange(t *testing.T) {

mysqlVersion := onlineddl.GetMySQLVersion(t, clusterInstance.Keyspaces[0].Shards[0].PrimaryTablet())
require.NotEmpty(t, mysqlVersion)
_, capableOf, _ := mysql.GetFlavor(mysqlVersion, nil)

var t1uuid string
var t2uuid string
Expand Down Expand Up @@ -647,28 +646,6 @@ func TestSchemaChange(t *testing.T) {
}
})
})
// INSTANT DDL
instantDDLCapable, err := capableOf(mysql.InstantAddLastColumnFlavorCapability)
require.NoError(t, err)
if instantDDLCapable {
t.Run("INSTANT DDL: postpone-completion", func(t *testing.T) {
t1uuid := testOnlineDDLStatement(t, instantAlterT1Statement, ddlStrategy+" --prefer-instant-ddl --postpone-completion", "vtgate", "", "", true)

t.Run("expect t1 queued", func(t *testing.T) {
// we want to validate that the migration remains queued even after some time passes. It must not move beyond 'queued'
time.Sleep(ensureStateNotChangedTime)
onlineddl.WaitForMigrationStatus(t, &vtParams, shards, t1uuid, normalWaitTime, schema.OnlineDDLStatusQueued, schema.OnlineDDLStatusReady)
onlineddl.CheckMigrationStatus(t, &vtParams, shards, t1uuid, schema.OnlineDDLStatusQueued, schema.OnlineDDLStatusReady)
})
t.Run("complete t1", func(t *testing.T) {
// Issue a complete and wait for successful completion
onlineddl.CheckCompleteMigration(t, &vtParams, shards, t1uuid, true)
status := onlineddl.WaitForMigrationStatus(t, &vtParams, shards, t1uuid, normalWaitTime, schema.OnlineDDLStatusComplete, schema.OnlineDDLStatusFailed)
fmt.Printf("# Migration status (for debug purposes): <%s>\n", status)
onlineddl.CheckMigrationStatus(t, &vtParams, shards, t1uuid, schema.OnlineDDLStatusComplete)
})
})
}
}

// testOnlineDDLStatement runs an online DDL, ALTER statement
Expand Down

0 comments on commit a8cccdb

Please sign in to comment.