address comments

Signed-off-by: 5kbpers <[email protected]>
pingcap · Mar 17, 2020 · 8043a9c · 8043a9c
1 parent c0e26ca
commit 8043a9c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/conn/conn.go b/pkg/conn/conn.go
@@ -127,9 +127,9 @@ skipStore:
 				if unexpectedStoreBehavior == SkipTiFlash {
 					continue skipStore
 				}
-				return nil, errors.Errorf(
-					"cannot restore to a cluster with active TiFlash stores (store %d at %s)", store.Id, store.Address)
 			}
+			return nil, errors.Errorf(
+				"cannot restore to a cluster with active TiFlash stores (store %d at %s)", store.Id, store.Address)
 		}
 		stores[j] = store
 		j++

diff --git a/pkg/restore/client.go b/pkg/restore/client.go
@@ -346,7 +346,7 @@ func (rc *Client) ExecDDLs(ddlJobs []*model.Job) error {
 
 func (rc *Client) setSpeedLimit() error {
 	if !rc.hasSpeedLimited && rc.rateLimit != 0 {
-		stores, err := conn.GetAllTiKVStores(rc.ctx, rc.pdClient, conn.ErrorOnTiFlash)
+		stores, err := conn.GetAllTiKVStores(rc.ctx, rc.pdClient, conn.SkipTiFlash)
 		if err != nil {
 			return err
 		}
@@ -486,7 +486,7 @@ func (rc *Client) SwitchToNormalMode(ctx context.Context) error {
 }
 
 func (rc *Client) switchTiKVMode(ctx context.Context, mode import_sstpb.SwitchMode) error {
-	stores, err := conn.GetAllTiKVStores(ctx, rc.pdClient, conn.ErrorOnTiFlash)
+	stores, err := conn.GetAllTiKVStores(ctx, rc.pdClient, conn.SkipTiFlash)
 	if err != nil {
 		return errors.Trace(err)
 	}

diff --git a/pkg/task/restore.go b/pkg/task/restore.go
@@ -75,7 +75,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.ErrorOnTiFlash)
+	mgr, err := newMgr(ctx, g, cfg.PD, cfg.TLS, conn.SkipTiFlash)
 	if err != nil {
 		return err
 	}