update

guojialiang92 · guojialiang92 · commit ad8564b311f7 · 2025-12-16T20:10:14.000+08:00
Signed-off-by: guojialiang &lt;guojialiang.2012@bytedance.com&gt;
diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -5293,7 +5293,7 @@ public void close() throws IOException {
                 assert translogManager instanceof InternalTranslogManager;
                 long localCheckpoint = engine.getProcessedLocalCheckpoint();
                 List<Tuple<Future<Integer>, Translog.Snapshot>> translogSnapshotsFutureList = new ArrayList<>();
-                for (int i = 0; i <= totalOperations / batchSize; i++) {
+                for (int i = 0; i < (totalOperations + batchSize - 1) / batchSize; i++) {
                     long start = localCheckpoint + 1 + (long) i * batchSize;
                     long end = (i == totalOperations / batchSize) ? Long.MAX_VALUE : start + batchSize - 1;
                     Translog.Snapshot translogSnapshot = ((InternalTranslogManager) translogManager).getTranslog().newSnapshot(start, end);
@@ -5312,15 +5312,16 @@ public void close() throws IOException {
                 for (Tuple<Future<Integer>, Translog.Snapshot> translogSnapshotFuture : translogSnapshotsFutureList) {
                     try {
                         int recoveredOps = translogSnapshotFuture.v1().get();
-                        Translog.Snapshot translogSnapshot = translogSnapshotFuture.v2();
-                        translogSnapshot.close();
                         totalRecovered += recoveredOps;
                     } catch (Exception e) {
                         if (exception == null) {
                             exception = e;
                         } else {
                             exception.addSuppressed(e);
                         }
+                    } finally {
+                        Translog.Snapshot translogSnapshot = translogSnapshotFuture.v2();
+                        IOUtils.closeWhileHandlingException(translogSnapshot);
                     }
                 }
                 if (exception != null) {
diff --git a/server/src/main/java/org/opensearch/indices/recovery/RecoverySettings.java b/server/src/main/java/org/opensearch/indices/recovery/RecoverySettings.java
@@ -240,6 +240,7 @@ public class RecoverySettings {
     public static final Setting<Long> INDICES_TRANSLOG_CONCURRENT_RECOVERY_BATCH_SIZE = Setting.longSetting(
         "indices.translog_concurrent_recovery.batch_size",
         50000,
+        1,
         Property.Dynamic,
         Property.NodeScope
     );
