restore: allow restore accross one major version (pingcap#33203)

close pingcap#33182
wuhuizuo · Mar 17, 2022 · e130e52 · e130e52
1 parent 0e0243c
commit e130e52
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/br/pkg/task/backup_raw.go b/br/pkg/task/backup_raw.go
@@ -202,7 +202,7 @@ func RunBackupRaw(c context.Context, g glue.Glue, cmdName string, cfg *RawKvConf
 	req := backuppb.BackupRequest{
 		ClusterId:        client.GetClusterID(),
 		StartKey:         backupRange.StartKey,
-		EndKey:           backupRange.StartKey,
+		EndKey:           backupRange.EndKey,
 		StartVersion:     0,
 		EndVersion:       0,
 		RateLimit:        cfg.RateLimit,

diff --git a/br/pkg/version/version.go b/br/pkg/version/version.go
@@ -119,7 +119,7 @@ func CheckClusterVersion(ctx context.Context, client pd.Client, checker VerCheck
 // CheckVersionForBackup checks the version for backup and
 func CheckVersionForBackup(backupVersion *semver.Version) VerChecker {
 	return func(store *metapb.Store, ver *semver.Version) error {
-		if backupVersion.Major > ver.Major {
+		if backupVersion.Major > ver.Major && backupVersion.Major-ver.Major > 1 {
 			return errors.Annotatef(berrors.ErrVersionMismatch,
 				"backup with cluster version %s cannot be restored at cluster of version %s: major version mismatches",
 				backupVersion, ver)

diff --git a/br/pkg/version/version_test.go b/br/pkg/version/version_test.go
@@ -148,11 +148,20 @@ func TestCheckClusterVersion(t *testing.T) {
 	}
 
 	{
-		// Restore across major version isn't allowed.
+		// Restore across one major version allowed.
 		mock.getAllStores = func() []*metapb.Store {
 			return []*metapb.Store{{Version: "v4.0.0-rc.1"}}
 		}
 		err := CheckClusterVersion(context.Background(), &mock, CheckVersionForBackup(semver.New("5.0.0-rc")))
+		require.NoError(t, err)
+	}
+
+	{
+		// Restore across two major versions isn't allowed.
+		mock.getAllStores = func() []*metapb.Store {
+			return []*metapb.Store{{Version: "v4.0.0-rc.1"}}
+		}
+		err := CheckClusterVersion(context.Background(), &mock, CheckVersionForBackup(semver.New("6.0.0")))
 		require.Error(t, err)
 	}
 

diff --git a/ddl/ddl.go b/ddl/ddl.go
@@ -650,14 +650,21 @@ func checkHistoryJobInTest(ctx sessionctx.Context, historyJob *model.Job) {
 			if _, ok := st.(*ast.CreatePlacementPolicyStmt); !ok {
 				panic(fmt.Sprintf("job ID %d, parse ddl job failed, query %s", historyJob.ID, historyJob.Query))
 			}
-		case model.ActionCreateTable, model.ActionCreateTables:
+		case model.ActionCreateTable:
 			if _, ok := st.(*ast.CreateTableStmt); !ok {
 				panic(fmt.Sprintf("job ID %d, parse ddl job failed, query %s", historyJob.ID, historyJob.Query))
 			}
 		case model.ActionCreateSchema:
 			if _, ok := st.(*ast.CreateDatabaseStmt); !ok {
 				panic(fmt.Sprintf("job ID %d, parse ddl job failed, query %s", historyJob.ID, historyJob.Query))
 			}
+		case model.ActionCreateTables:
+			_, isCreateTable := st.(*ast.CreateTableStmt)
+			_, isCreateSeq := st.(*ast.CreateSequenceStmt)
+			_, isCreateView := st.(*ast.CreateViewStmt)
+			if !isCreateTable && !isCreateSeq && !isCreateView {
+				panic(fmt.Sprintf("job ID %d, parse ddl job failed, query %s", historyJob.ID, historyJob.Query))
+			}
 		default:
 			if _, ok := st.(ast.DDLNode); !ok {
 				panic(fmt.Sprintf("job ID %d, parse ddl job failed, query %s", historyJob.ID, historyJob.Query))