Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

domain: avoid check schema changed when change is tiflash replica replica status (#13034) #14884

Merged
merged 2 commits into from
Feb 21, 2020
Merged

domain: avoid check schema changed when change is tiflash replica replica status (#13034) #14884

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce947e2
domain: avoid check schema changed when change is tiflash replica sta…
crazycs520 Feb 21, 2020
bdf1680
mocktikv: fix data race in mocktikv split (#12414)
lysu Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions ddl/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3331,6 +3331,38 @@ func (s *testDBSuite4) TestAlterShardRowIDBits(c *C) {
c.Assert(err.Error(), Equals, "[autoid:1467]Failed to read auto-increment value from storage engine")
}

func (s *testDBSuite2) TestSkipSchemaChecker(c *C) {
s.tk = testkit.NewTestKit(c, s.store)
tk := s.tk
tk.MustExec("use test")
tk.MustExec("drop table if exists t1")
defer tk.MustExec("drop table if exists t1")
tk.MustExec("create table t1 (a int)")
tk2 := testkit.NewTestKit(c, s.store)
tk2.MustExec("use test")

// Test skip schema checker for ActionSetTiFlashReplica.
tk.MustExec("begin")
tk.MustExec("insert into t1 set a=1;")
tk2.MustExec("alter table t1 set tiflash replica 2 location labels 'a','b';")
tk.MustExec("commit")

// Test skip schema checker for ActionUpdateTiFlashReplicaStatus.
tk.MustExec("begin")
tk.MustExec("insert into t1 set a=1;")
tb := testGetTableByName(c, s.tk.Se, "test", "t1")
err := domain.GetDomain(s.tk.Se).DDL().UpdateTableReplicaInfo(s.tk.Se, tb.Meta().ID, true)
c.Assert(err, IsNil)
tk.MustExec("commit")

// Test can't skip schema checker.
tk.MustExec("begin")
tk.MustExec("insert into t1 set a=1;")
tk2.MustExec("alter table t1 add column b int;")
_, err = tk.Exec("commit")
c.Assert(terror.ErrorEqual(domain.ErrInfoSchemaChanged, err), IsTrue)
}

func (s *testDBSuite2) TestLockTables(c *C) {
s.tk = testkit.NewTestKit(c, s.store)
tk := s.tk
Expand Down
11 changes: 11 additions & 0 deletions domain/domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,23 @@ func (do *Domain) tryLoadSchemaDiffs(m *meta.Meta, usedVersion, newVersion int64
if err != nil {
return false, nil, err
}
if canSkipSchemaCheckerDDL(diff.Type) {
continue
}
tblIDs = append(tblIDs, ids...)
}
builder.Build()
return true, tblIDs, nil
}

func canSkipSchemaCheckerDDL(tp model.ActionType) bool {
switch tp {
case model.ActionUpdateTiFlashReplicaStatus, model.ActionSetTiFlashReplica:
return true
}
return false
}

// InfoSchema gets information schema from domain.
func (do *Domain) InfoSchema() infoschema.InfoSchema {
return do.infoHandle.Get()
Expand Down