fix(redis): tendisSSD重建热备binlog检查公式bug TencentBlueKing#9215

cycker · Feb 7, 2025 · 2f9dc59 · 2f9dc59
1 parent d4bc6a9
commit 2f9dc59
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/dbm-services/redis/db-tools/dbactuator/pkg/atomjobs/atomredis/tendisssd_dr_restore.go b/dbm-services/redis/db-tools/dbactuator/pkg/atomjobs/atomredis/tendisssd_dr_restore.go
@@ -513,19 +513,18 @@ export LD_LIBRARY_PATH=LD_LIBRARY_PATH:%s
 	if task.Err != nil {
 		return
 	}
-	if slaveBinlogRange.FirstSeq < masterBinlogRange.FirstSeq {
-		task.Err = fmt.Errorf("slave(%s) binlog_first_seq:%d < master(%s) binlog_first_seq:%d",
-			task.SlaveAddr(), slaveBinlogRange.FirstSeq, task.MasterAddr(), masterBinlogRange.FirstSeq)
-		task.runtime.Logger.Error(task.Err.Error())
-		return
-	}
-	if slaveBinlogRange.EndSeq > masterBinlogRange.EndSeq {
-		task.Err = fmt.Errorf("slave(%s) binlog_end_seq:%d > master(%s) binlog_end_seq:%d",
-			task.SlaveAddr(), slaveBinlogRange.EndSeq, task.MasterAddr(), masterBinlogRange.EndSeq)
+
+	binlogCheckOk := slaveBinlogRange.EndSeq >= masterBinlogRange.FirstSeq &&
+		slaveBinlogRange.EndSeq <= masterBinlogRange.EndSeq
+	if !binlogCheckOk {
+		task.Err =
+			fmt.Errorf("slave(%s) binlog_range %s not in master(%s) binlog_range:%s, binlog_range check failed",
+				task.SlaveAddr(), slaveBinlogRange.String(), task.MasterAddr(), masterBinlogRange.String())
 		task.runtime.Logger.Error(task.Err.Error())
 		return
 	}
-	msg = fmt.Sprintf("master(%s) binlog_range:%s,slave(%s) binlog_range:%s,is ok",
+
+	msg = fmt.Sprintf("master(%s) binlog_range:%s, slave(%s) binlog_range:%s binlog_range check ok",
 		task.MasterAddr(), masterBinlogRange.String(), task.SlaveAddr(), slaveBinlogRange.String())
 	task.runtime.Logger.Info(msg)