sijie closed pull request #2126: Slow consumer prevents offloaded ledger cleanup
URL: https://github.com/apache/incubator-pulsar/pull/2126
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
index fc25ef3598..388cdef84c 100644
---
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
+++
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -1732,16 +1732,19 @@ void internalTrimConsumedLedgers(CompletableFuture<?>
promise) {
} else if (overRetentionQuota) {
log.debug("[{}] Ledger {} is over quota", name,
ls.getLedgerId());
ledgersToDelete.add(ls);
- } else if (isOffloadedNeedsDelete(ls.getOffloadContext())) {
- log.debug("[{}] Ledger {} has been offloaded, bookkeeper
ledger needs to be deleted",
- name, ls.getLedgerId());
- offloadedLedgersToDelete.add(ls);
} else {
- log.debug("[{}] Nothing done for ledger {}. Neither
expired, over-quota nor offloaded",
+ log.debug("[{}] Ledger {} not deleted. Neither expired nor
over-quota",
name, ls.getLedgerId());
break;
}
}
+ for (LedgerInfo ls : ledgers.values()) {
+ if (isOffloadedNeedsDelete(ls.getOffloadContext()) &&
!ledgersToDelete.contains(ls)) {
+ log.debug("[{}] Ledger {} has been offloaded, bookkeeper
ledger needs to be deleted",
+ name, ls.getLedgerId());
+ offloadedLedgersToDelete.add(ls);
+ }
+ }
if (ledgersToDelete.isEmpty() &&
offloadedLedgersToDelete.isEmpty()) {
trimmerMutex.unlock();
diff --git
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java
index 41a7ad0480..b574d90617 100644
---
a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java
+++
b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java
@@ -25,6 +25,7 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import org.apache.bookkeeper.mledger.ManagedCursor;
import org.apache.bookkeeper.mledger.ManagedLedgerConfig;
import org.apache.bookkeeper.mledger.util.MockClock;
import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
@@ -145,4 +146,58 @@ public void testLaggedDeleteRetentionSetLower() throws
Exception {
assertEventuallyTrue(() -> !bkc.getLedgers().contains(firstLedgerId));
assertEventuallyTrue(() ->
offloader.deletedOffloads().contains(firstLedgerId));
}
+
+ @Test
+ public void testLaggedDeleteSlowConsumer() throws Exception {
+ OffloadPrefixTest.MockLedgerOffloader offloader = new
OffloadPrefixTest.MockLedgerOffloader();
+
+ ManagedLedgerConfig config = new ManagedLedgerConfig();
+ MockClock clock = new MockClock();
+ config.setMaxEntriesPerLedger(10);
+ config.setMinimumRolloverTime(0, TimeUnit.SECONDS);
+ config.setRetentionTime(10, TimeUnit.MINUTES);
+ config.setOffloadLedgerDeletionLag(5, TimeUnit.MINUTES);
+ config.setLedgerOffloader(offloader);
+ config.setClock(clock);
+
+ ManagedLedgerImpl ledger =
(ManagedLedgerImpl)factory.open("my_test_ledger", config);
+ ManagedCursor cursor = ledger.openCursor("sub1");
+
+ for (int i = 0; i < 15; i++) {
+ String content = "entry-" + i;
+ ledger.addEntry(content.getBytes());
+ }
+ Assert.assertEquals(ledger.getLedgersInfoAsList().size(), 2);
+ long firstLedgerId =
ledger.getLedgersInfoAsList().get(0).getLedgerId();
+
+ ledger.offloadPrefix(ledger.getLastConfirmedEntry());
+
+ Assert.assertEquals(ledger.getLedgersInfoAsList().size(), 2);
+ Assert.assertEquals(ledger.getLedgersInfoAsList().stream()
+ .filter(e -> e.getOffloadContext().getComplete())
+ .map(e ->
e.getLedgerId()).collect(Collectors.toSet()),
+ offloader.offloadedLedgers());
+ Assert.assertTrue(bkc.getLedgers().contains(firstLedgerId));
+
+ clock.advance(2, TimeUnit.MINUTES);
+
+ CompletableFuture<Void> promise = new CompletableFuture<>();
+ ledger.internalTrimConsumedLedgers(promise);
+ promise.join();
+ Assert.assertTrue(bkc.getLedgers().contains(firstLedgerId));
+
+ clock.advance(5, TimeUnit.MINUTES);
+ CompletableFuture<Void> promise2 = new CompletableFuture<>();
+ ledger.internalTrimConsumedLedgers(promise2);
+ promise2.join();
+
+ // assert bk ledger is deleted
+ assertEventuallyTrue(() -> !bkc.getLedgers().contains(firstLedgerId));
+
+ // ledger still exists in list
+ Assert.assertEquals(ledger.getLedgersInfoAsList().stream()
+ .filter(e -> e.getOffloadContext().getComplete())
+ .map(e ->
e.getLedgerId()).collect(Collectors.toSet()),
+ offloader.offloadedLedgers());
+ }
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
