database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: fix unstable multi-schema change test (#37985)

Browse Source 
close pingcap/tidb#37973
This commit is contained in:
tangenta
2022-09-20 15:57:04 +08:00
committed by GitHub
parent 2c35087811
commit 3f43ecfd52
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ddl/multi_schema_change_test.go
View File

@ -141,6 +141,7 @@ func TestMultiSchemaChangeAddColumnsCancelled(t *testing.T) {
tk.MustExec("insert into t values (1);")
hook := newCancelJobHook(t, store, dom, func(job *model.Job) bool {
// Cancel job when the column 'c' is in write-reorg.
assertMultiSchema(t, job, 3)
return job.MultiSchemaInfo.SubJobs[1].SchemaState == model.StateWriteReorganization
})
dom.DDL().SetHook(hook)
@ -220,6 +221,7 @@ func TestMultiSchemaChangeDropColumnsCancelled(t *testing.T) {
tk.MustExec("insert into t values ();")
hook := newCancelJobHook(t, store, dom, func(job *model.Job) bool {
// Cancel job when the column 'a' is in delete-reorg.
assertMultiSchema(t, job, 3)
return job.MultiSchemaInfo.SubJobs[1].SchemaState == model.StateDeleteReorganization
})
dom.DDL().SetHook(hook)
@ -234,6 +236,7 @@ func TestMultiSchemaChangeDropColumnsCancelled(t *testing.T) {
tk.MustExec("insert into t values ();")
hook = newCancelJobHook(t, store, dom, func(job *model.Job) bool {
// Cancel job when the column 'a' is in public.
assertMultiSchema(t, job, 3)
return job.MultiSchemaInfo.SubJobs[1].SchemaState == model.StatePublic
})
dom.DDL().SetHook(hook)
@ -255,6 +258,7 @@ func TestMultiSchemaChangeDropIndexedColumnsCancelled(t *testing.T) {
tk.MustExec("insert into t values ();")
hook := newCancelJobHook(t, store, dom, func(job *model.Job) bool {
// Cancel job when the column 'a' is in delete-reorg.
assertMultiSchema(t, job, 3)
return job.MultiSchemaInfo.SubJobs[1].SchemaState == model.StateDeleteReorganization
})
dom.DDL().SetHook(hook)
@ -354,6 +358,7 @@ func TestMultiSchemaChangeRenameColumns(t *testing.T) {
tk.MustExec("insert into t values ()")
hook := newCancelJobHook(t, store, dom, func(job *model.Job) bool {
// Cancel job when the column 'c' is in write-reorg.
assertMultiSchema(t, job, 2)
return job.MultiSchemaInfo.SubJobs[0].SchemaState == model.StateWriteReorganization
})
dom.DDL().SetHook(hook)
@ -422,6 +427,7 @@ func TestMultiSchemaChangeAlterColumns(t *testing.T) {
tk.MustExec("create table t (a int default 1, b int default 2)")
hook := newCancelJobHook(t, store, dom, func(job *model.Job) bool {
// Cancel job when the column 'a' is in write-reorg.
assertMultiSchema(t, job, 2)
return job.MultiSchemaInfo.SubJobs[0].SchemaState == model.StateWriteReorganization
})
dom.DDL().SetHook(hook)
@ -490,6 +496,7 @@ func TestMultiSchemaChangeChangeColumns(t *testing.T) {
tk.MustExec("insert into t values ()")
hook := newCancelJobHook(t, store, dom, func(job *model.Job) bool {
// Cancel job when the column 'c' is in write-reorg.
assertMultiSchema(t, job, 2)
return job.MultiSchemaInfo.SubJobs[0].SchemaState == model.StateWriteReorganization
})
dom.DDL().SetHook(hook)
@ -548,6 +555,7 @@ func TestMultiSchemaChangeAddIndexesCancelled(t *testing.T) {
tk.MustExec("insert into t values (1, 2, 3);")
cancelHook := newCancelJobHook(t, store, dom, func(job *model.Job) bool {
// Cancel the job when index 't2' is in write-reorg.
assertMultiSchema(t, job, 4)
return job.MultiSchemaInfo.SubJobs[2].SchemaState == model.StateWriteReorganization
})
dom.DDL().SetHook(cancelHook)
@ -566,6 +574,7 @@ func TestMultiSchemaChangeAddIndexesCancelled(t *testing.T) {
tk.MustExec("insert into t values (1, 2, 3);")
cancelHook = newCancelJobHook(t, store, dom, func(job *model.Job) bool {
// Cancel the job when index 't1' is in public.
assertMultiSchema(t, job, 4)
return job.MultiSchemaInfo.SubJobs[1].SchemaState == model.StatePublic
})
dom.DDL().SetHook(cancelHook)
@ -614,6 +623,7 @@ func TestMultiSchemaChangeDropIndexesCancelled(t *testing.T) {
// Test for cancelling the job in a middle state.
tk.MustExec("create table t (a int, b int, index(a), unique index(b), index idx(a, b));")
hook := newCancelJobHook(t, store, dom, func(job *model.Job) bool {
assertMultiSchema(t, job, 3)
return job.MultiSchemaInfo.SubJobs[1].SchemaState == model.StateDeleteOnly
})
dom.DDL().SetHook(hook)
@ -628,6 +638,7 @@ func TestMultiSchemaChangeDropIndexesCancelled(t *testing.T) {
tk.MustExec("drop table if exists t;")
tk.MustExec("create table t (a int, b int, index(a), unique index(b), index idx(a, b));")
hook = newCancelJobHook(t, store, dom, func(job *model.Job) bool {
assertMultiSchema(t, job, 3)
return job.MultiSchemaInfo.SubJobs[1].SchemaState == model.StatePublic
})
dom.DDL().SetHook(hook)
@ -722,6 +733,7 @@ func TestMultiSchemaChangeRenameIndexes(t *testing.T) {
tk.MustExec("insert into t values ()")
hook := newCancelJobHook(t, store, dom, func(job *model.Job) bool {
// Cancel job when the column 'c' is in write-reorg.
assertMultiSchema(t, job, 2)
return job.MultiSchemaInfo.SubJobs[0].SchemaState == model.StateWriteReorganization
})
dom.DDL().SetHook(hook)
@ -869,6 +881,7 @@ func TestMultiSchemaChangeModifyColumnsCancelled(t *testing.T) {
tk.MustExec("create table t (a int, b int, c int, index i1(a), unique index i2(b), index i3(a, b));")
tk.MustExec("insert into t values (1, 2, 3);")
hook := newCancelJobHook(t, store, dom, func(job *model.Job) bool {
assertMultiSchema(t, job, 3)
return job.MultiSchemaInfo.SubJobs[2].SchemaState == model.StateWriteReorganization
})
dom.DDL().SetHook(hook)
@ -1218,3 +1231,9 @@ func putTheSameDDLJobTwice(t *testing.T, fn func()) {
err = failpoint.Disable("github.com/pingcap/tidb/ddl/mockParallelSameDDLJobTwice")
require.NoError(t, err)
}
func assertMultiSchema(t *testing.T, job *model.Job, subJobLen int) {
assert.Equal(t, model.ActionMultiSchemaChange, job.Type, job)
assert.NotNil(t, job.MultiSchemaInfo, job)
assert.Len(t, job.MultiSchemaInfo.SubJobs, subJobLen, job)
}