commit some suggestions

Signed-off-by: Jianjun Liao <[email protected]>

Author: Leavrth

br/pkg/restore/misc.go

@@ -506,12 +506,14 @@ func GroupOverlappedBackupFileSetsIter(ctx context.Context, regionClient split.S
 			// into the set.
 			thisBackupFileSet.SSTFiles = append(thisBackupFileSet.SSTFiles, file.backupFileSet.SSTFiles...)
 			if thisBackupFileSet.TableID != file.backupFileSet.TableID || !thisBackupFileSet.RewriteRules.Equal(file.backupFileSet.RewriteRules) {
-				log.Panic("the overlapped SST must have the same table id and rewrite rules",
+				log.Error("the overlapped SST must have the same table id and rewrite rules",
 					zap.Int64("set table id", thisBackupFileSet.TableID),
 					zap.Int64("file table id", file.backupFileSet.TableID),
 					zap.Reflect("set rewrite rule", thisBackupFileSet.RewriteRules),
 					zap.Reflect("file rewrite rule", file.backupFileSet.RewriteRules),
 				)
+				return errors.Errorf("the overlapped SST must have the same table id(%d<>%d) and rewrite rules",
+					thisBackupFileSet.TableID, file.backupFileSet.TableID)
 			}
 			// update lastEndKey if file.endKey is larger
 			if bytes.Compare(lastEndKey, file.endKey) < 0 {

br/pkg/restore/snap_client/import.go

@@ -724,7 +724,8 @@ func (importer *SnapFileImporter) batchDownloadSST(
 				bytes.Equal(cfReq.RewriteRule.OldKeyPrefix, req.RewriteRule.OldKeyPrefix) &&
 				cfReq.RewriteRule.IgnoreAfterTimestamp == req.RewriteRule.IgnoreAfterTimestamp &&
 				cfReq.RewriteRule.IgnoreBeforeTimestamp == req.RewriteRule.IgnoreBeforeTimestamp) {
-				log.Panic("rewrite rule mismatch", zap.Reflect("cfReq", cfReq.RewriteRule), zap.Reflect("req", req.RewriteRule))
+				log.Error("rewrite rule mismatch", zap.Reflect("cfReq", cfReq.RewriteRule), zap.Reflect("req", req.RewriteRule))
+				return nil, errors.Errorf("rewrite rules mismatch from the overlapped SST files")
 			}
 			cfReq.Ssts[req.Name] = &sstMeta
 		}