From 55d9dd036ca53b23f59fc2aa2e45152f5641bd47 Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Fri, 22 Mar 2019 15:04:02 +0800 Subject: [PATCH 1/4] Revert "binlog: update config for backward compatibility (#9688)" This reverts commit 792429d330732bd7c56626e1b651be1144da343a. --- config/config.go | 4 ++-- config/config.toml.example | 8 +++----- config/config_test.go | 6 ++---- executor/set_test.go | 6 +++--- session/session.go | 2 +- sessionctx/binloginfo/binloginfo.go | 8 ++------ tidb-server/main.go | 2 +- 7 files changed, 14 insertions(+), 22 deletions(-) diff --git a/config/config.go b/config/config.go index 2a3361ff90a70..959e400648ac1 100644 --- a/config/config.go +++ b/config/config.go @@ -250,8 +250,7 @@ type TiKVClient struct { // Binlog is the config for binlog. type Binlog struct { - Enable bool `toml:"enable" json:"enable"` - AutoMode bool `toml:"auto-mode" json:"auto-mode"` + Enable string `toml:"enable" json:"enable"` WriteTimeout string `toml:"write-timeout" json:"write-timeout"` // If IgnoreError is true, when writing binlog meets error, TiDB would // ignore the error. @@ -344,6 +343,7 @@ var defaultConf = Config{ BatchWaitSize: 8, }, Binlog: Binlog{ + Enable: "auto", WriteTimeout: "15s", }, } diff --git a/config/config.toml.example b/config/config.toml.example index bcfd24384ac2d..65c3b5f6a693e 100644 --- a/config/config.toml.example +++ b/config/config.toml.example @@ -261,11 +261,9 @@ enabled = true capacity = 2048000 [binlog] -# Enable to write binlog. This config will be disabled if auto-mode is true. -enable = false - -# If auto-mode is true, will enable binlog according to the system variables 'tidb_log_bin'. -auto-mode = false +# Enable to write binlog. Values can be "on", "off" or "auto". +# If value is "auto", will enable binlog according to the system variables 'tidb_log_bin'. +enable = "auto" # WriteTimeout specifies how long it will wait for writing binlog to pump. write-timeout = "15s" diff --git a/config/config_test.go b/config/config_test.go index 137c07572053f..9981886f32511 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -33,8 +33,7 @@ func TestT(t *testing.T) { func (s *testConfigSuite) TestConfig(c *C) { conf := new(Config) - conf.Binlog.Enable = true - conf.Binlog.AutoMode = true + conf.Binlog.Enable = "auto" conf.Binlog.IgnoreError = true conf.TiKVClient.CommitTimeout = "10s" conf.CheckMb4ValueInUtf8 = true @@ -55,8 +54,7 @@ max-batch-size=128 c.Assert(conf.Load(configFile), IsNil) // Test that the original value will not be clear by load the config file that does not contain the option. - c.Assert(conf.Binlog.Enable, Equals, true) - c.Assert(conf.Binlog.AutoMode, Equals, true) + c.Assert(conf.Binlog.Enable, Equals, "auto") c.Assert(conf.TiKVClient.CommitTimeout, Equals, "41s") c.Assert(conf.TiKVClient.MaxBatchSize, Equals, uint(128)) diff --git a/executor/set_test.go b/executor/set_test.go index 54a6c347627b7..c7bb09db41a4c 100644 --- a/executor/set_test.go +++ b/executor/set_test.go @@ -18,8 +18,8 @@ import ( . "github.com/pingcap/check" "github.com/pingcap/parser/terror" + "github.com/pingcap/tidb/config" "github.com/pingcap/tidb/sessionctx" - "github.com/pingcap/tidb/sessionctx/binloginfo" "github.com/pingcap/tidb/sessionctx/variable" "github.com/pingcap/tidb/util/testkit" "github.com/pingcap/tidb/util/testutil" @@ -239,8 +239,8 @@ func (s *testSuite2) TestSetVar(c *C) { tk.MustExec("set @@sql_log_bin = on") tk.MustQuery(`select @@session.sql_log_bin;`).Check(testkit.Rows("1")) - tk.MustQuery(`select @@global.log_bin;`).Check(testkit.Rows(variable.BoolToIntStr(binloginfo.ShouldEnableBinlog()))) - tk.MustQuery(`select @@log_bin;`).Check(testkit.Rows(variable.BoolToIntStr(binloginfo.ShouldEnableBinlog()))) + tk.MustQuery(`select @@global.log_bin;`).Check(testkit.Rows(variable.BoolToIntStr(config.GetGlobalConfig().Binlog.Enable == "on"))) + tk.MustQuery(`select @@log_bin;`).Check(testkit.Rows(variable.BoolToIntStr(config.GetGlobalConfig().Binlog.Enable == "on"))) tk.MustExec("set global tidb_log_bin = on") tk.MustQuery(`select @@global.tidb_log_bin;`).Check(testkit.Rows("1")) diff --git a/session/session.go b/session/session.go index 0bd30c0545a1f..1dc619ce71f26 100644 --- a/session/session.go +++ b/session/session.go @@ -1361,7 +1361,7 @@ func BootstrapSession(store kv.Storage) (*domain.Domain, error) { return nil, errors.Trace(err) } - // get global system variable tidb_log_bin from mysql.GLOBAL_VARIABLES + // get global system tidb_log_bin from mysql.GLOBAL_VARIABLES tidbLogBin, err := se1.GetGlobalSysVar(variable.TiDBLogBin) if err != nil { return nil, errors.Trace(err) diff --git a/sessionctx/binloginfo/binloginfo.go b/sessionctx/binloginfo/binloginfo.go index 0976fb8801ab3..996902a48ece8 100644 --- a/sessionctx/binloginfo/binloginfo.go +++ b/sessionctx/binloginfo/binloginfo.go @@ -95,13 +95,9 @@ func SetIgnoreError(on bool) { } } -// ShouldEnableBinlog returns true if Binlog.AutoMode is false and Binlog.Enable is true, or Binlog.AutoMode is true and tidb_log_bin's value is "1" +// ShouldEnableBinlog returns true if binlog.enable is "on", or binlog.enable is "auto" and tidb_log_bin's value is "1" func ShouldEnableBinlog() bool { - if config.GetGlobalConfig().Binlog.AutoMode { - return variable.SysVars[variable.TiDBLogBin].Value == "1" - } - - return config.GetGlobalConfig().Binlog.Enable + return config.GetGlobalConfig().Binlog.Enable == "on" || (config.GetGlobalConfig().Binlog.Enable == "auto" && variable.SysVars[variable.TiDBLogBin].Value == "1") } // WriteBinlog writes a binlog to Pump. diff --git a/tidb-server/main.go b/tidb-server/main.go index c12814fabe10c..d6c73e7a2ca34 100644 --- a/tidb-server/main.go +++ b/tidb-server/main.go @@ -100,7 +100,7 @@ var ( port = flag.String(nmPort, "4000", "tidb server port") cors = flag.String(nmCors, "", "tidb server allow cors origin") socket = flag.String(nmSocket, "", "The socket file to use for connection.") - enableBinlog = flagBoolean(nmEnableBinlog, false, "enable generate binlog") + enableBinlog = flag.String(nmEnableBinlog, "auto", "enable generate binlog") runDDL = flagBoolean(nmRunDDL, true, "run ddl worker on this tidb-server") ddlLease = flag.String(nmDdlLease, "45s", "schema lease duration, very dangerous to change only if you know what you do") tokenLimit = flag.Int(nmTokenLimit, 1000, "the limit of concurrent executed sessions") From dd30679487bd50c0c1f4febb63d59467f4c9bb83 Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Fri, 22 Mar 2019 15:04:32 +0800 Subject: [PATCH 2/4] Revert "binlog: update binlog enable config && add tidb_log_bin system variable (#9625)" This reverts commit 0dada1ec37df88d0bcdc6b6cf687407ba9393d6f. --- config/config.go | 3 +-- config/config.toml.example | 5 ++--- config/config_test.go | 4 ++-- executor/set_test.go | 9 ++------- session/session.go | 7 ------- sessionctx/binloginfo/binloginfo.go | 7 ------- sessionctx/variable/sysvar.go | 3 --- sessionctx/variable/varsutil.go | 2 +- tidb-server/main.go | 9 ++++----- 9 files changed, 12 insertions(+), 37 deletions(-) diff --git a/config/config.go b/config/config.go index 959e400648ac1..8a12976a6dad3 100644 --- a/config/config.go +++ b/config/config.go @@ -250,7 +250,7 @@ type TiKVClient struct { // Binlog is the config for binlog. type Binlog struct { - Enable string `toml:"enable" json:"enable"` + Enable bool `toml:"enable" json:"enable"` WriteTimeout string `toml:"write-timeout" json:"write-timeout"` // If IgnoreError is true, when writing binlog meets error, TiDB would // ignore the error. @@ -343,7 +343,6 @@ var defaultConf = Config{ BatchWaitSize: 8, }, Binlog: Binlog{ - Enable: "auto", WriteTimeout: "15s", }, } diff --git a/config/config.toml.example b/config/config.toml.example index 65c3b5f6a693e..8b1d8a100f319 100644 --- a/config/config.toml.example +++ b/config/config.toml.example @@ -261,9 +261,8 @@ enabled = true capacity = 2048000 [binlog] -# Enable to write binlog. Values can be "on", "off" or "auto". -# If value is "auto", will enable binlog according to the system variables 'tidb_log_bin'. -enable = "auto" +# enable to write binlog. +enable = false # WriteTimeout specifies how long it will wait for writing binlog to pump. write-timeout = "15s" diff --git a/config/config_test.go b/config/config_test.go index 9981886f32511..5347c9c50473f 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -33,7 +33,7 @@ func TestT(t *testing.T) { func (s *testConfigSuite) TestConfig(c *C) { conf := new(Config) - conf.Binlog.Enable = "auto" + conf.Binlog.Enable = true conf.Binlog.IgnoreError = true conf.TiKVClient.CommitTimeout = "10s" conf.CheckMb4ValueInUtf8 = true @@ -54,7 +54,7 @@ max-batch-size=128 c.Assert(conf.Load(configFile), IsNil) // Test that the original value will not be clear by load the config file that does not contain the option. - c.Assert(conf.Binlog.Enable, Equals, "auto") + c.Assert(conf.Binlog.Enable, Equals, true) c.Assert(conf.TiKVClient.CommitTimeout, Equals, "41s") c.Assert(conf.TiKVClient.MaxBatchSize, Equals, uint(128)) diff --git a/executor/set_test.go b/executor/set_test.go index c7bb09db41a4c..6fdb59fef08ab 100644 --- a/executor/set_test.go +++ b/executor/set_test.go @@ -239,13 +239,8 @@ func (s *testSuite2) TestSetVar(c *C) { tk.MustExec("set @@sql_log_bin = on") tk.MustQuery(`select @@session.sql_log_bin;`).Check(testkit.Rows("1")) - tk.MustQuery(`select @@global.log_bin;`).Check(testkit.Rows(variable.BoolToIntStr(config.GetGlobalConfig().Binlog.Enable == "on"))) - tk.MustQuery(`select @@log_bin;`).Check(testkit.Rows(variable.BoolToIntStr(config.GetGlobalConfig().Binlog.Enable == "on"))) - - tk.MustExec("set global tidb_log_bin = on") - tk.MustQuery(`select @@global.tidb_log_bin;`).Check(testkit.Rows("1")) - tk.MustExec("set global tidb_log_bin = off") - tk.MustQuery(`select @@global.tidb_log_bin;`).Check(testkit.Rows("0")) + tk.MustQuery(`select @@global.log_bin;`).Check(testkit.Rows(variable.BoolToIntStr(config.GetGlobalConfig().Binlog.Enable))) + tk.MustQuery(`select @@log_bin;`).Check(testkit.Rows(variable.BoolToIntStr(config.GetGlobalConfig().Binlog.Enable))) tk.MustExec("set @@tidb_general_log = 1") tk.MustExec("set @@tidb_general_log = 0") diff --git a/session/session.go b/session/session.go index 1dc619ce71f26..9f1f6b5e4b00f 100644 --- a/session/session.go +++ b/session/session.go @@ -1361,13 +1361,6 @@ func BootstrapSession(store kv.Storage) (*domain.Domain, error) { return nil, errors.Trace(err) } - // get global system tidb_log_bin from mysql.GLOBAL_VARIABLES - tidbLogBin, err := se1.GetGlobalSysVar(variable.TiDBLogBin) - if err != nil { - return nil, errors.Trace(err) - } - variable.SysVars[variable.TiDBLogBin].Value = tidbLogBin - if len(cfg.Plugin.Load) > 0 { plugin.InitWatchLoops(dom.GetEtcdClient()) } diff --git a/sessionctx/binloginfo/binloginfo.go b/sessionctx/binloginfo/binloginfo.go index 996902a48ece8..8be106c057222 100644 --- a/sessionctx/binloginfo/binloginfo.go +++ b/sessionctx/binloginfo/binloginfo.go @@ -24,11 +24,9 @@ import ( "github.com/pingcap/parser/terror" "github.com/pingcap/tidb-tools/tidb-binlog/node" pumpcli "github.com/pingcap/tidb-tools/tidb-binlog/pump_client" - "github.com/pingcap/tidb/config" "github.com/pingcap/tidb/kv" "github.com/pingcap/tidb/metrics" "github.com/pingcap/tidb/sessionctx" - "github.com/pingcap/tidb/sessionctx/variable" binlog "github.com/pingcap/tipb/go-binlog" log "github.com/sirupsen/logrus" "google.golang.org/grpc" @@ -95,11 +93,6 @@ func SetIgnoreError(on bool) { } } -// ShouldEnableBinlog returns true if binlog.enable is "on", or binlog.enable is "auto" and tidb_log_bin's value is "1" -func ShouldEnableBinlog() bool { - return config.GetGlobalConfig().Binlog.Enable == "on" || (config.GetGlobalConfig().Binlog.Enable == "auto" && variable.SysVars[variable.TiDBLogBin].Value == "1") -} - // WriteBinlog writes a binlog to Pump. func (info *BinlogInfo) WriteBinlog(clusterID uint64) error { skip := atomic.LoadUint32(&skipBinlog) diff --git a/sessionctx/variable/sysvar.go b/sessionctx/variable/sysvar.go index 0ba6b3419cb31..d0ffdb6a31ee3 100644 --- a/sessionctx/variable/sysvar.go +++ b/sessionctx/variable/sysvar.go @@ -388,7 +388,6 @@ var defaultSysVars = []*SysVar{ {ScopeSession, "last_insert_id", ""}, {ScopeNone, "innodb_ft_cache_size", "8000000"}, {ScopeNone, LogBin, "0"}, - {ScopeGlobal, TiDBLogBin, "0"}, {ScopeGlobal, "innodb_disable_sort_file_cache", "OFF"}, {ScopeGlobal, "log_error_verbosity", ""}, {ScopeNone, "performance_schema_hosts_size", "100"}, @@ -749,8 +748,6 @@ const ( SQLLogBin = "sql_log_bin" // LogBin is the name for 'log_bin' system variable. LogBin = "log_bin" - // TiDBLogBin is the name for 'tidb_log_bin' system variable. - TiDBLogBin = "tidb_log_bin" // MaxSortLength is the name for 'max_sort_length' system variable. MaxSortLength = "max_sort_length" // MaxSpRecursionDepth is the name for 'max_sp_recursion_depth' system variable. diff --git a/sessionctx/variable/varsutil.go b/sessionctx/variable/varsutil.go index a0d061181b246..db8cce5ba7ed9 100644 --- a/sessionctx/variable/varsutil.go +++ b/sessionctx/variable/varsutil.go @@ -350,7 +350,7 @@ func ValidateSetSystemVar(vars *SessionVars, name string, value string) (string, case WarningCount, ErrorCount: return value, ErrReadOnly.GenWithStackByArgs(name) case GeneralLog, TiDBGeneralLog, AvoidTemporalUpgrade, BigTables, CheckProxyUsers, LogBin, - CoreFile, EndMakersInJSON, SQLLogBin, TiDBLogBin, OfflineMode, PseudoSlaveMode, LowPriorityUpdates, + CoreFile, EndMakersInJSON, SQLLogBin, OfflineMode, PseudoSlaveMode, LowPriorityUpdates, SkipNameResolve, SQLSafeUpdates, TiDBConstraintCheckInPlace: if strings.EqualFold(value, "ON") || value == "1" { return "1", nil diff --git a/tidb-server/main.go b/tidb-server/main.go index d6c73e7a2ca34..be9d60ccec7d2 100644 --- a/tidb-server/main.go +++ b/tidb-server/main.go @@ -100,7 +100,7 @@ var ( port = flag.String(nmPort, "4000", "tidb server port") cors = flag.String(nmCors, "", "tidb server allow cors origin") socket = flag.String(nmSocket, "", "The socket file to use for connection.") - enableBinlog = flag.String(nmEnableBinlog, "auto", "enable generate binlog") + enableBinlog = flagBoolean(nmEnableBinlog, false, "enable generate binlog") runDDL = flagBoolean(nmRunDDL, true, "run ddl worker on this tidb-server") ddlLease = flag.String(nmDdlLease, "45s", "schema lease duration, very dangerous to change only if you know what you do") tokenLimit = flag.Int(nmTokenLimit, 1000, "the limit of concurrent executed sessions") @@ -146,10 +146,9 @@ func main() { setupLog() setupTracing() // Should before createServer and after setup config. printInfo() + setupBinlogClient() setupMetrics() createStoreAndDomain() - // setupBinlogClient should run after bootstrap - setupBinlogClient() createServer() signal.SetupSignalHandler(serverShutdown) runServer() @@ -188,7 +187,7 @@ func createStoreAndDomain() { } func setupBinlogClient() { - if !binloginfo.ShouldEnableBinlog() { + if !cfg.Binlog.Enable { return } @@ -453,7 +452,7 @@ func setGlobalVars() { variable.SysVars[variable.TIDBMemQuotaQuery].Value = strconv.FormatInt(cfg.MemQuotaQuery, 10) variable.SysVars["lower_case_table_names"].Value = strconv.Itoa(cfg.LowerCaseTableNames) - variable.SysVars[variable.LogBin].Value = variable.BoolToIntStr(binloginfo.ShouldEnableBinlog()) + variable.SysVars[variable.LogBin].Value = variable.BoolToIntStr(config.GetGlobalConfig().Binlog.Enable) variable.SysVars[variable.Port].Value = fmt.Sprintf("%d", cfg.Port) variable.SysVars[variable.Socket].Value = cfg.Socket From 4fd1ad1e26279eca80533afc0bc15375ff381815 Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Fri, 22 Mar 2019 15:15:47 +0800 Subject: [PATCH 3/4] add send binlog strategy config --- config/config.go | 3 +++ config/config.toml.example | 3 +++ config/config_test.go | 2 ++ go.mod | 2 +- go.sum | 2 ++ tidb-server/main.go | 2 +- 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/config/config.go b/config/config.go index 8a12976a6dad3..6ab636cff3d01 100644 --- a/config/config.go +++ b/config/config.go @@ -257,6 +257,8 @@ type Binlog struct { IgnoreError bool `toml:"ignore-error" json:"ignore-error"` // Use socket file to write binlog, for compatible with kafka version tidb-binlog. BinlogSocket string `toml:"binlog-socket" json:"binlog-socket"` + // The strategy for sending binlog to pump, value can be "range" or "hash" now. + Strategy string `toml:"strategy" json:"strategy"` } // Plugin is the config for plugin @@ -344,6 +346,7 @@ var defaultConf = Config{ }, Binlog: Binlog{ WriteTimeout: "15s", + Strategy: "range", }, } diff --git a/config/config.toml.example b/config/config.toml.example index 8b1d8a100f319..6c5e8bda1d8ce 100644 --- a/config/config.toml.example +++ b/config/config.toml.example @@ -273,3 +273,6 @@ ignore-error = false # use socket file to write binlog, for compatible with kafka version tidb-binlog. binlog-socket = "" + +# the strategy for sending binlog to pump, value can be "range" or "hash" now. +strategy = "range" \ No newline at end of file diff --git a/config/config_test.go b/config/config_test.go index 5347c9c50473f..aa3a91496b09c 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -35,6 +35,7 @@ func (s *testConfigSuite) TestConfig(c *C) { conf := new(Config) conf.Binlog.Enable = true conf.Binlog.IgnoreError = true + conf.Binlog.Strategy = "hash" conf.TiKVClient.CommitTimeout = "10s" conf.CheckMb4ValueInUtf8 = true configFile := "config.toml" @@ -55,6 +56,7 @@ max-batch-size=128 // Test that the original value will not be clear by load the config file that does not contain the option. c.Assert(conf.Binlog.Enable, Equals, true) + c.Assert(conf.Binlog.Strategy, Equals, "hash") c.Assert(conf.TiKVClient.CommitTimeout, Equals, "41s") c.Assert(conf.TiKVClient.MaxBatchSize, Equals, uint(128)) diff --git a/go.mod b/go.mod index 360f37df49dcb..2334fa8c642a6 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/pingcap/log v0.0.0-20190307075452-bd41d9273596 github.com/pingcap/parser v0.0.0-20190321052000-f9a452f8f24e github.com/pingcap/pd v2.1.0-rc.4+incompatible - github.com/pingcap/tidb-tools v2.1.3-0.20190116051332-34c808eef588+incompatible + github.com/pingcap/tidb-tools v2.1.3-0.20190321065848-1e8b48f5c168+incompatible github.com/pingcap/tipb v0.0.0-20190107072121-abbec73437b7 github.com/pquerna/ffjson v0.0.0-20181028064349-e517b90714f7 // indirect github.com/prometheus/client_golang v0.9.0 diff --git a/go.sum b/go.sum index 30c92606cea8b..4ba6160a01a86 100644 --- a/go.sum +++ b/go.sum @@ -125,6 +125,8 @@ github.com/pingcap/pd v2.1.0-rc.4+incompatible h1:/buwGk04aHO5odk/+O8ZOXGs4qkUjY github.com/pingcap/pd v2.1.0-rc.4+incompatible/go.mod h1:nD3+EoYes4+aNNODO99ES59V83MZSI+dFbhyr667a0E= github.com/pingcap/tidb-tools v2.1.3-0.20190116051332-34c808eef588+incompatible h1:e9Gi/LP9181HT3gBfSOeSBA+5JfemuE4aEAhqNgoE4k= github.com/pingcap/tidb-tools v2.1.3-0.20190116051332-34c808eef588+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM= +github.com/pingcap/tidb-tools v2.1.3-0.20190321065848-1e8b48f5c168+incompatible h1:MkWCxgZpJBgY2f4HtwWMMFzSBb3+JPzeJgF3VrXE/bU= +github.com/pingcap/tidb-tools v2.1.3-0.20190321065848-1e8b48f5c168+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM= github.com/pingcap/tipb v0.0.0-20190107072121-abbec73437b7 h1:wnjdQRhybddDesBVBKyOLUPgDaOFdtqA92pduBgWvVQ= github.com/pingcap/tipb v0.0.0-20190107072121-abbec73437b7/go.mod h1:RtkHW8WbcNxj8lsbzjaILci01CtYnYbIkQhjyZWrWVI= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= diff --git a/tidb-server/main.go b/tidb-server/main.go index be9d60ccec7d2..fd54e4c070874 100644 --- a/tidb-server/main.go +++ b/tidb-server/main.go @@ -207,7 +207,7 @@ func setupBinlogClient() { } if len(cfg.Binlog.BinlogSocket) == 0 { - client, err = pumpcli.NewPumpsClient(cfg.Path, parseDuration(cfg.Binlog.WriteTimeout), securityOption) + client, err = pumpcli.NewPumpsClient(cfg.Path, cfg.Binlog.Strategy, parseDuration(cfg.Binlog.WriteTimeout), securityOption) } else { client, err = pumpcli.NewLocalPumpsClient(cfg.Path, cfg.Binlog.BinlogSocket, parseDuration(cfg.Binlog.WriteTimeout), securityOption) } From c0f573b3da24ccc059a350e8f333a10d0f368667 Mon Sep 17 00:00:00 2001 From: WangXiangUSTC Date: Fri, 22 Mar 2019 16:29:10 +0800 Subject: [PATCH 4/4] go mod tidy --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 4ba6160a01a86..6341b69fed8c0 100644 --- a/go.sum +++ b/go.sum @@ -123,8 +123,6 @@ github.com/pingcap/parser v0.0.0-20190321052000-f9a452f8f24e h1:Evw2H5BmAGqHTKbb github.com/pingcap/parser v0.0.0-20190321052000-f9a452f8f24e/go.mod h1:1FNvfp9+J0wvc4kl8eGNh7Rqrxveg15jJoWo/a0uHwA= github.com/pingcap/pd v2.1.0-rc.4+incompatible h1:/buwGk04aHO5odk/+O8ZOXGs4qkUjYTJ2UpCJXna8NE= github.com/pingcap/pd v2.1.0-rc.4+incompatible/go.mod h1:nD3+EoYes4+aNNODO99ES59V83MZSI+dFbhyr667a0E= -github.com/pingcap/tidb-tools v2.1.3-0.20190116051332-34c808eef588+incompatible h1:e9Gi/LP9181HT3gBfSOeSBA+5JfemuE4aEAhqNgoE4k= -github.com/pingcap/tidb-tools v2.1.3-0.20190116051332-34c808eef588+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM= github.com/pingcap/tidb-tools v2.1.3-0.20190321065848-1e8b48f5c168+incompatible h1:MkWCxgZpJBgY2f4HtwWMMFzSBb3+JPzeJgF3VrXE/bU= github.com/pingcap/tidb-tools v2.1.3-0.20190321065848-1e8b48f5c168+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM= github.com/pingcap/tipb v0.0.0-20190107072121-abbec73437b7 h1:wnjdQRhybddDesBVBKyOLUPgDaOFdtqA92pduBgWvVQ=