From 6e7f0cbff3955a01e5b0121514012374073d1c60 Mon Sep 17 00:00:00 2001
From: takenliu <takenliu@tencent.com>
Date: Thu, 8 Jan 2026 16:42:51 +0800
Subject: [PATCH] Fix bug:   The master node may repeatedly dump the same batch
 of binlogs, when the slave node is busy, leading to repeated timeouts and
 reconnections in master-slave synchronization.

---
 src/tendisplus/storage/rocks/rocks_kvstore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tendisplus/storage/rocks/rocks_kvstore.cpp b/src/tendisplus/storage/rocks/rocks_kvstore.cpp
index 19285f7d..0ca377ff 100644
--- a/src/tendisplus/storage/rocks/rocks_kvstore.cpp
+++ b/src/tendisplus/storage/rocks/rocks_kvstore.cpp
@@ -1768,11 +1768,11 @@ Expected<TruncateBinlogResult> RocksKVStore::truncateBinlogV2(
 
     result.err = err;
     result.written = written;
-    result.newDump = newDump;
     // slave use timestamp from last dump binlog
     result.timestamp = ts;
     newEnd = newDump - 1;
   }
+  result.newDump = newDump;
 
   auto nextTry = start;
   while (true) {
@@ -1798,7 +1798,7 @@ Expected<TruncateBinlogResult> RocksKVStore::truncateBinlogV2(
     // master use timestamp from deleterange last binlog
     result.timestamp = ts;
   }
-  if (fs == nullptr) {
+  if (result.newStart > result.newDump) {
     result.newDump = result.newStart;
   }