Revert "br: check the correct changefeed info when restore/import dat… (

#50397)
pingcap · Jan 13, 2024 · fe69d60 · fe69d60
1 parent 7d7be12
commit fe69d60
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 276 deletions.
diff --git a/br/pkg/task/stream.go b/br/pkg/task/stream.go
@@ -1069,20 +1069,7 @@ func checkTaskExists(ctx context.Context, cfg *RestoreConfig) error {
 		return err
 	}
 	if len(tasks) > 0 {
-		return errors.Errorf("log backup task is running: %s, "+
-			"please stop the task before restore, and after PITR operation finished, "+
-			"create log-backup task again and create a full backup on this cluster", tasks[0].Info.Name)
-	}
-
-	// check cdc changefeed
-	if cfg.CheckRequirements {
-		nameSet, err := utils.GetCDCChangefeedNameSet(ctx, etcdCLI)
-		if err != nil {
-			return err
-		}
-		if !nameSet.Empty() {
-			return errors.Errorf("%splease stop changefeed(s) before restore", nameSet.MessageToUser())
-		}
+		return errors.Errorf("log backup task is running: %s, please stop the task before restore, and after PITR operation finished, create log-backup task again and create a full backup on this cluster", tasks[0].Info.Name)
 	}
 	return nil
 }

diff --git a/br/pkg/utils/BUILD.bazel b/br/pkg/utils/BUILD.bazel
@@ -4,7 +4,6 @@ go_library(
     name = "utils",
     srcs = [
         "backoff.go",
-        "cdc.go",
         "db.go",
         "dyn_pprof_other.go",
         "dyn_pprof_unix.go",
@@ -52,7 +51,6 @@ go_library(
         "@com_github_tikv_client_go_v2//oracle",
         "@com_github_tikv_client_go_v2//tikv",
         "@com_github_tikv_pd_client//:client",
-        "@io_etcd_go_etcd_client_v3//:client",
         "@org_golang_google_grpc//:grpc",
         "@org_golang_google_grpc//backoff",
         "@org_golang_google_grpc//codes",
@@ -73,7 +71,6 @@ go_test(
     timeout = "short",
     srcs = [
         "backoff_test.go",
-        "cdc_test.go",
         "db_test.go",
         "env_test.go",
         "json_test.go",
@@ -115,8 +112,6 @@ go_test(
         "@com_github_stretchr_testify//require",
         "@com_github_tikv_client_go_v2//tikv",
         "@com_github_tikv_pd_client//:client",
-        "@io_etcd_go_etcd_client_v3//:client",
-        "@io_etcd_go_etcd_tests_v3//integration",
         "@org_golang_google_grpc//:grpc",
         "@org_golang_google_grpc//codes",
         "@org_golang_google_grpc//status",

diff --git a/br/pkg/utils/cdc.go b/br/pkg/utils/cdc.go
diff --git a/br/pkg/utils/cdc_test.go b/br/pkg/utils/cdc_test.go