log-backup: get can restored global-checkpoint-ts when support v3 che…

…ckpoint advance (#36197) close #29501
pingcap · Jul 13, 2022 · 1885ebf · 1885ebf
1 parent 5eec739
commit 1885ebf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/br/pkg/task/stream.go b/br/pkg/task/stream.go
@@ -1339,9 +1339,11 @@ func getGlobalResolvedTS(
 		return 0, errors.Trace(err)
 	}
 	var globalCheckpointTS uint64 = 0
-	// TODO change the logic after checkpoint v3 implemented
+	// If V3 global-checkpoint advance, the maximum value in storeMap.resolvedTSMap as global-checkpoint-ts.
+	// If v2 global-checkpoint advance, it need the minimal value in storeMap.resolvedTSMap as global-checkpoint-ts.
+	// Because each of store maintains own checkpoint-ts only.
 	for _, resolveTS := range storeMap.resolvedTSMap {
-		if resolveTS < globalCheckpointTS || globalCheckpointTS == 0 {
+		if globalCheckpointTS < resolveTS {
 			globalCheckpointTS = resolveTS
 		}
 	}

diff --git a/br/pkg/task/stream_test.go b/br/pkg/task/stream_test.go
@@ -277,7 +277,7 @@ func TestGetGlobalResolvedTS(t *testing.T) {
 	require.Nil(t, err)
 	globalResolvedTS, err := getGlobalResolvedTS(ctx, s)
 	require.Nil(t, err)
-	require.Equal(t, uint64(100), globalResolvedTS)
+	require.Equal(t, uint64(101), globalResolvedTS)
 }
 
 func TestGetGlobalResolvedTS2(t *testing.T) {
@@ -309,5 +309,5 @@ func TestGetGlobalResolvedTS2(t *testing.T) {
 	require.Nil(t, err)
 	globalResolvedTS, err := getGlobalResolvedTS(ctx, s)
 	require.Nil(t, err)
-	require.Equal(t, uint64(98), globalResolvedTS)
+	require.Equal(t, uint64(99), globalResolvedTS)
 }