add flag to control check

pingcap · May 26, 2020 · b67be9d · b67be9d
1 parent 61e1738
commit b67be9d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 15 deletions.
diff --git a/pkg/conn/conn.go b/pkg/conn/conn.go
@@ -156,6 +156,7 @@ func NewMgr(
 	tlsConf *tls.Config,
 	securityOption pd.SecurityOption,
 	storeBehavior StoreBehavior,
+	checkRequirements bool,
 ) (*Mgr, error) {
 	addrs := strings.Split(pdAddrs, ",")
 
@@ -196,9 +197,11 @@ func NewMgr(
 		log.Error("fail to create pd client", zap.Error(err))
 		return nil, err
 	}
-	err = utils.CheckClusterVersion(ctx, pdClient)
-	if err != nil {
-		return nil, err
+	if checkRequirements {
+		err = utils.CheckClusterVersion(ctx, pdClient)
+		if err != nil {
+			return nil, err
+		}
 	}
 	log.Info("new mgr", zap.String("pdAddrs", pdAddrs))
 

diff --git a/pkg/task/backup.go b/pkg/task/backup.go
@@ -113,7 +113,7 @@ func RunBackup(c context.Context, g glue.Glue, cmdName string, cfg *BackupConfig
 	if err != nil {
 		return err
 	}
-	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.SkipTiFlash)
+	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.SkipTiFlash, cfg.CheckRequirements)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/task/backup_raw.go b/pkg/task/backup_raw.go
@@ -91,7 +91,7 @@ func RunBackupRaw(c context.Context, g glue.Glue, cmdName string, cfg *RawKvConf
 	if err != nil {
 		return err
 	}
-	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.SkipTiFlash)
+	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.SkipTiFlash, cfg.CheckRequirements)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/task/common.go b/pkg/task/common.go
@@ -45,10 +45,11 @@ const (
 	flagDatabase = "db"
 	flagTable    = "table"
 
-	flagRateLimit     = "ratelimit"
-	flagRateLimitUnit = "ratelimit-unit"
-	flagConcurrency   = "concurrency"
-	flagChecksum      = "checksum"
+	flagRateLimit        = "ratelimit"
+	flagRateLimitUnit    = "ratelimit-unit"
+	flagConcurrency      = "concurrency"
+	flagChecksum         = "checksum"
+	flagCheckRequirement = "check-requirements"
 )
 
 // TLSConfig is the common configuration for TLS connection.
@@ -91,8 +92,9 @@ type Config struct {
 	// LogProgress is true means the progress bar is printed to the log instead of stdout.
 	LogProgress bool `json:"log-progress" toml:"log-progress"`
 
-	CaseSensitive bool         `json:"case-sensitive" toml:"case-sensitive"`
-	Filter        filter.Rules `json:"black-white-list" toml:"black-white-list"`
+	CaseSensitive     bool         `json:"case-sensitive" toml:"case-sensitive"`
+	CheckRequirements bool         `json:"check-requirements" toml:"check-requirements"`
+	Filter            filter.Rules `json:"black-white-list" toml:"black-white-list"`
 }
 
 // DefineCommonFlags defines the flags common to all BRIE commands.
@@ -116,6 +118,9 @@ func DefineCommonFlags(flags *pflag.FlagSet) {
 	flags.Uint64(flagRateLimitUnit, utils.MB, "The unit of rate limit")
 	_ = flags.MarkHidden(flagRateLimitUnit)
 
+	flags.Bool(flagCheckRequirement, true,
+		"Whether start version check before execute command")
+
 	storage.DefineFlags(flags)
 }
 
@@ -203,6 +208,11 @@ func (cfg *Config) ParseFromFlags(flags *pflag.FlagSet) error {
 			cfg.Filter.DoDBs = []string{db}
 		}
 	}
+	checkRequirements, err := flags.GetBool(flagCheckRequirement)
+	if err != nil {
+		return errors.Trace(err)
+	}
+	cfg.CheckRequirements = checkRequirements
 
 	if err := cfg.BackendOptions.ParseFromFlags(flags); err != nil {
 		return err
@@ -217,6 +227,7 @@ func newMgr(
 	pds []string,
 	tlsConfig TLSConfig,
 	storeBehavior conn.StoreBehavior,
+	checkRequirements bool,
 ) (*conn.Mgr, error) {
 	var (
 		tlsConf *tls.Config
@@ -243,7 +254,7 @@ func newMgr(
 	if err != nil {
 		return nil, err
 	}
-	return conn.NewMgr(ctx, g, pdAddress, store.(tikv.Storage), tlsConf, securityOption, storeBehavior)
+	return conn.NewMgr(ctx, g, pdAddress, store.(tikv.Storage), tlsConf, securityOption, storeBehavior, checkRequirements)
 }
 
 // GetStorage gets the storage backend from the config.

diff --git a/pkg/task/restore.go b/pkg/task/restore.go
@@ -99,7 +99,7 @@ func RunRestore(c context.Context, g glue.Glue, cmdName string, cfg *RestoreConf
 	ctx, cancel := context.WithCancel(c)
 	defer cancel()
 
-	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.SkipTiFlash)
+	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.SkipTiFlash, cfg.CheckRequirements)
 	if err != nil {
 		return err
 	}
@@ -525,7 +525,7 @@ func RunRestoreTiflashReplica(c context.Context, g glue.Glue, cmdName string, cf
 	ctx, cancel := context.WithCancel(c)
 	defer cancel()
 
-	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.SkipTiFlash)
+	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.SkipTiFlash, cfg.CheckRequirements)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/task/restore_raw.go b/pkg/task/restore_raw.go
@@ -51,7 +51,7 @@ func RunRestoreRaw(c context.Context, g glue.Glue, cmdName string, cfg *RestoreR
 	ctx, cancel := context.WithCancel(c)
 	defer cancel()
 
-	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.ErrorOnTiFlash)
+	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.ErrorOnTiFlash, cfg.CheckRequirements)
 	if err != nil {
 		return err
 	}