address comments

apache · Feb 20, 2024 · 4e623c2 · 4e623c2
1 parent a1460e2
commit 4e623c2
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerFragmentReplicator.java
@@ -469,7 +469,9 @@ public void readComplete(int rc, LedgerHandle lh, Enumeration<LedgerEntry> seq,
                         LOG.error("BK error reading ledger entries: {} - {}",
                                 startEntryId, endEntryId, BKException.create(rc));
                         onReadEntryFailureCallback.accept(lh.getId(), startEntryId);
-                        ledgerFragmentMcb.processResult(rc, null, null);
+                        for (int i = 0; i < entriesToReplicateCnt; i++) {
+                            ledgerFragmentMcb.processResult(rc, null, null);
+                        }
                         return;
                     }
                     long lastEntryId = startEntryId;
@@ -534,14 +536,15 @@ public void writeComplete(int rc, long ledgerId, long entryId, BookieId addr, Ob
                         }
                         toSend.release();
                     }
-                    if (lastEntryId == endEntryId) {
-                        ledgerFragmentMcb.processResult(BKException.Code.OK, null, null);
-                    } else {
+                    if (lastEntryId != endEntryId) {
                         try {
                             batchRecoverLedgerFragmentEntry(lastEntryId + 1, endEntryId, lh,
                                     ledgerFragmentMcb, newBookies, onReadEntryFailureCallback);
                         } catch (InterruptedException e) {
-                            ledgerFragmentMcb.processResult(BKException.Code.InterruptedException, null, null);
+                            int remainingEntries = (int) (endEntryId - lastEntryId);
+                            for (int i = 0; i < remainingEntries; i++) {
+                                ledgerFragmentMcb.processResult(BKException.Code.InterruptedException, null, null);
+                            }
                         }
                     }
                 }