Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

restore: restore tidb config after restoring #509

Merged
merged 8 commits into from
Sep 17, 2020
Merged

restore: restore tidb config after restoring #509

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eaf70e8
restore: restore tidb config after restoring
Sep 17, 2020
74cfba4
Merge branch 'master' into restore-config
YuJuncen Sep 17, 2020
0fc1545
tests: add assertions that ensure the config is unchanged
Sep 17, 2020
d358957
Merge branch 'restore-config' of https://github.com/YuJuncen/br into …
Sep 17, 2020
8ba44ef
tests: add test to check the function `enableTiDBConfig` itself
Sep 17, 2020
4f330cb
Apply suggestions from code review
YuJuncen Sep 17, 2020
d2a1ba9
tests: remove unused import
Sep 17, 2020
c7e8666
Merge branch 'master' into restore-config
ti-srebot Sep 17, 2020
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: 18 additions & 14 deletions pkg/task/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ func RunRestore(c context.Context, g glue.Glue, cmdName string, cfg *RestoreConf
ddlJobs := restore.FilterDDLJobs(client.GetDDLJobs(), tables)

// pre-set TiDB config for restore
enableTiDBConfig()
restoreDBConfig := enableTiDBConfig()
defer restoreDBConfig()

// execute DDL first
err = client.ExecDDLs(ddlJobs)
Expand Down Expand Up @@ -413,19 +414,22 @@ func RunRestoreTiflashReplica(c context.Context, g glue.Glue, cmdName string, cf
return nil
}

func enableTiDBConfig() {
// set max-index-length before execute DDLs and create tables
// we set this value to max(3072*4), otherwise we might not restore table
// when upstream and downstream both set this value greater than default(3072)
conf := config.GetGlobalConfig()
conf.MaxIndexLength = config.DefMaxOfMaxIndexLength
log.Warn("set max-index-length to max(3072*4) to skip check index length in DDL")

// we need set this to true, since all create table DDLs will create with tableInfo
// and we can handle alter drop pk/add pk DDLs with no impact
conf.AlterPrimaryKey = true

config.StoreGlobalConfig(conf)
// enableTiDBConfig tweaks some of configs of TiDB to make the restore progress go well.
// return a function that could restore the config to origin.
func enableTiDBConfig() func() {
restoreConfig := config.RestoreFunc()
config.UpdateGlobal(func(conf *config.Config) {
// set max-index-length before execute DDLs and create tables
// we set this value to max(3072*4), otherwise we might not restore table
// when upstream and downstream both set this value greater than default(3072)
conf.MaxIndexLength = config.DefMaxOfMaxIndexLength
log.Warn("set max-index-length to max(3072*4) to skip check index length in DDL")

// we need set this to true, since all create table DDLs will create with tableInfo
// and we can handle alter drop pk/add pk DDLs with no impact
conf.AlterPrimaryKey = true
})
return restoreConfig
}

// restoreTableStream blocks current goroutine and restore a stream of tables,
Expand Down