draft

Signed-off-by: Wenqi Mou <[email protected]>

Author: Tristan1900

br/pkg/checkpoint/BUILD.bazel

@@ -8,6 +8,7 @@ go_library(
         "external_storage.go",
         "log_restore.go",
         "manager.go",
+        "name.go",
         "restore.go",
         "storage.go",
         "ticker.go",
@@ -43,12 +44,15 @@ go_library(
 go_test(
     name = "checkpoint_test",
     timeout = "short",
-    srcs = ["checkpoint_test.go"],
+    srcs = [
+        "checkpoint_test.go",
+        "name_test.go",
+    ],
+    embed = [":checkpoint"],
     flaky = True,
     race = "on",
     shard_count = 13,
     deps = [
-        ":checkpoint",
         "//br/pkg/gluetidb",
         "//br/pkg/pdutil",
         "//br/pkg/storage",

br/pkg/checkpoint/checkpoint_test.go

@@ -36,6 +36,8 @@ import (
 	"github.com/tikv/client-go/v2/oracle"
 )
 
+const tableSuffix string = "foo"
+
 func TestCheckpointMetaForBackup(t *testing.T) {
 	ctx := context.Background()
 	base := t.TempDir()

br/pkg/checkpoint/log_restore.go

@@ -187,7 +187,7 @@ type TaskInfoForLogRestore struct {
 	Progress RestoreProgress
 }
 
-func TryToGetCheckpointTaskInfo(
+func GetCheckpointTaskInfo(
 	ctx context.Context,
 	snapshotManager SnapshotMetaManagerT,
 	logManager LogMetaManagerT,

br/pkg/checkpoint/manager.go

@@ -27,9 +27,12 @@ import (
 	"github.com/pingcap/tidb/pkg/parser/ast"
 )
 
+// SnapshotMetaManagerT is a type alias for MetaManager interface specialized for snapshot restoration
 type SnapshotMetaManagerT = MetaManager[
 	RestoreKeyType, RestoreValueType, RestoreValueType, CheckpointMetadataForSnapshotRestore,
 ]
+
+// LogMetaManagerT is a type alias for LogMetaManager interface specialized for log restoration
 type LogMetaManagerT = LogMetaManager[
 	LogRestoreKeyType, LogRestoreValueType, LogRestoreValueMarshaled, CheckpointMetadataForLogRestore,
 ]
@@ -48,6 +51,8 @@ func DefaultTickDurationConfig() tickDurationConfig {
 	}
 }
 
+// MetaManager defines the interface for checkpoint metadata operations
+// It handles loading, saving, and checking the existence of checkpoint data
 type MetaManager[K KeyType, SV, LV ValueType, M any] interface {
 	fmt.Stringer
 
@@ -67,6 +72,8 @@ type MetaManager[K KeyType, SV, LV ValueType, M any] interface {
 	Close()
 }
 
+// LogMetaManager extends MetaManager with additional operations specific to log restoration
+// This includes handling checkpoint progress and ingest index repair SQLs
 type LogMetaManager[K KeyType, SV, LV ValueType, M any] interface {
 	MetaManager[K, SV, LV, M]
 
@@ -79,6 +86,8 @@ type LogMetaManager[K KeyType, SV, LV ValueType, M any] interface {
 	ExistsCheckpointIngestIndexRepairSQLs(context.Context) (bool, error)
 }
 
+// TableMetaManager implements the MetaManager interface using database tables for storage
+// It stores checkpoint data in tables within the TiDB database
 type TableMetaManager[K KeyType, SV, LV ValueType, M any] struct {
 	se       glue.Session
 	runnerSe glue.Session
@@ -90,6 +99,7 @@ func NewLogTableMetaManager(
 	g glue.Glue,
 	dom *domain.Domain,
 	dbName string,
+	id uint64,
 ) (LogMetaManagerT, error) {
 	se, err := g.CreateSession(dom.Store())
 	if err != nil {
@@ -105,14 +115,15 @@ func NewLogTableMetaManager(
 		se:       se,
 		runnerSe: runnerSe,
 		dom:      dom,
-		dbName:   dbName,
+		dbName:   fmt.Sprintf("%s_%d", dbName, id),
 	}, nil
 }
 
 func NewSnapshotTableMetaManager(
 	g glue.Glue,
 	dom *domain.Domain,
 	dbName string,
+	id uint64,
 ) (SnapshotMetaManagerT, error) {
 	se, err := g.CreateSession(dom.Store())
 	if err != nil {
@@ -128,7 +139,7 @@ func NewSnapshotTableMetaManager(
 		se:       se,
 		runnerSe: runnerSe,
 		dom:      dom,
-		dbName:   dbName,
+		dbName:   fmt.Sprintf("%s_%d", dbName, id),
 	}, nil
 }
 
@@ -145,7 +156,7 @@ func (manager *TableMetaManager[K, SV, LV, M]) Close() {
 	}
 }
 
-// load the whole checkpoint range data and retrieve the metadata of restored ranges
+// LoadCheckpointData loads the whole checkpoint range data and retrieve the metadata of restored ranges
 // and return the total time cost in the past executions
 func (manager *TableMetaManager[K, SV, LV, M]) LoadCheckpointData(
 	ctx context.Context,
@@ -281,14 +292,15 @@ func NewSnapshotStorageMetaManager(
 	cipher *backuppb.CipherInfo,
 	clusterID uint64,
 	prefix string,
+	id uint64,
 ) SnapshotMetaManagerT {
 	return &StorageMetaManager[
 		RestoreKeyType, RestoreValueType, RestoreValueType, CheckpointMetadataForSnapshotRestore,
 	]{
 		storage:   storage,
 		cipher:    cipher,
 		clusterID: fmt.Sprintf("%d", clusterID),
-		taskName:  fmt.Sprintf("%d/%s", clusterID, prefix),
+		taskName:  fmt.Sprintf("%d/%s_%d", clusterID, prefix, id),
 	}
 }
 
@@ -297,14 +309,15 @@ func NewLogStorageMetaManager(
 	cipher *backuppb.CipherInfo,
 	clusterID uint64,
 	prefix string,
+	id uint64,
 ) LogMetaManagerT {
 	return &StorageMetaManager[
 		LogRestoreKeyType, LogRestoreValueType, LogRestoreValueMarshaled, CheckpointMetadataForLogRestore,
 	]{
 		storage:   storage,
 		cipher:    cipher,
 		clusterID: fmt.Sprintf("%d", clusterID),
-		taskName:  fmt.Sprintf("%d/%s", clusterID, prefix),
+		taskName:  fmt.Sprintf("%d/%s_%d", clusterID, prefix, id),
 	}
 }
 

br/pkg/restore/log_client/client.go

@@ -213,6 +213,8 @@ type LogClient struct {
 
 	logFilesStat logFilesStatistic
 	restoreStat  restoreStatistics
+
+	checkpointTableSuffix string
 }
 
 type restoreStatistics struct {