Merge branch 'master' into add_historical_stats_test_2

pingcap · Jan 19, 2023 · 804fcdd · 804fcdd
2 parents 7c92b72 + 8ec2612
commit 804fcdd
Show file tree

Hide file tree

Showing 86 changed files with 12,138 additions and 10,462 deletions.
diff --git a/br/pkg/backup/client.go b/br/pkg/backup/client.go
@@ -312,13 +312,13 @@ func (bc *Client) StartCheckpointRunner(
 		}
 	}
 
-	bc.checkpointRunner = checkpoint.StartCheckpointRunner(ctx, bc.storage, bc.cipher)
-	return nil
+	bc.checkpointRunner, err = checkpoint.StartCheckpointRunner(ctx, bc.storage, bc.cipher, bc.mgr.GetPDClient())
+	return errors.Trace(err)
 }
 
-func (bc *Client) WaitForFinishCheckpoint() {
+func (bc *Client) WaitForFinishCheckpoint(ctx context.Context) {
 	if bc.checkpointRunner != nil {
-		bc.checkpointRunner.WaitForFinish()
+		bc.checkpointRunner.WaitForFinish(ctx)
 	}
 }
 

diff --git a/br/pkg/checkpoint/BUILD.bazel b/br/pkg/checkpoint/BUILD.bazel
@@ -15,6 +15,7 @@ go_library(
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_kvproto//pkg/brpb",
         "@com_github_pingcap_log//:log",
+        "@com_github_tikv_client_go_v2//oracle",
         "@org_uber_go_zap//:zap",
     ],
 )
@@ -29,5 +30,6 @@ go_test(
         "@com_github_pingcap_kvproto//pkg/brpb",
         "@com_github_pingcap_kvproto//pkg/encryptionpb",
         "@com_github_stretchr_testify//require",
+        "@com_github_tikv_client_go_v2//oracle",
     ],
 )