restore: don't change TiDB config to support lightning via SQL (pingc…

…ap#545)
overvenus · Jan 4, 2021 · d89fe86 · d89fe86
1 parent d1becd4
commit d89fe86
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/lightning/restore/checksum.go b/lightning/restore/checksum.go
@@ -75,6 +75,7 @@ func newChecksumManager(ctx context.Context, rc *RestoreController) (ChecksumMan
 			return nil, errors.Trace(err)
 		}
 
+		// TODO: make tikv.Driver{}.Open use arguments instead of global variables
 		if tlsOpt.CAPath != "" {
 			conf := tidbcfg.GetGlobalConfig()
 			conf.Security.ClusterSSLCA = tlsOpt.CAPath

diff --git a/lightning/restore/restore.go b/lightning/restore/restore.go
@@ -31,7 +31,6 @@ import (
 	sstpb "github.com/pingcap/kvproto/pkg/import_sstpb"
 	"github.com/pingcap/parser/model"
 	"github.com/pingcap/tidb-lightning/lightning/glue"
-	tidbcfg "github.com/pingcap/tidb/config"
 	"github.com/pingcap/tidb/meta/autoid"
 	"github.com/pingcap/tidb/table"
 	"github.com/pingcap/tidb/table/tables"
@@ -73,8 +72,6 @@ const (
 var DeliverPauser = common.NewPauser()
 
 func init() {
-	cfg := tidbcfg.GetGlobalConfig()
-	cfg.Log.SlowThreshold = 3000
 	// used in integration tests
 	failpoint.Inject("SetMinDeliverBytes", func(v failpoint.Value) {
 		minDeliverBytes = uint64(v.(int))