Skip to content

[fix][ml] Avoid blocking the factory-shutdown thread on serial managed-ledger close #26063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
merlimat wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −7
Open

[fix][ml] Avoid blocking the factory-shutdown thread on serial managed-ledger close #26063

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions ...ged-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,9 +707,10 @@ public void closeFailed(ManagedLedgerException exception, Object ctx) {
? bookkeeperFactory.get()
: CompletableFuture.completedFuture(null);
return bookkeeperFuture
.thenRun(() -> {
.thenCompose(__ -> {
log.info().attr("numLedgers", ledgers.size()).log("Closing ledgers");
//make sure all callbacks is called.
List<CompletableFuture<Void>> remainingFutures = new ArrayList<>();
ledgers.forEach(((ledgerName, ledgerFuture) -> {
if (!ledgerFuture.isDone()) {
ledgerFuture.completeExceptionally(
Expand All @@ -719,14 +720,26 @@ public void closeFailed(ManagedLedgerException exception, Object ctx) {
if (managedLedger == null) {
return;
}
try {
managedLedger.close();
} catch (Throwable throwable) {
log.warn().attr("managedLedger", managedLedger.getName()).exception(throwable)
.log("Got exception when closing managed ledger");
}
// Close asynchronously so a slow close cannot block, serially, the thread
// that completes the shutdown future.
CompletableFuture<Void> closeFuture = new CompletableFuture<>();
remainingFutures.add(closeFuture);
managedLedger.asyncClose(new AsyncCallbacks.CloseCallback() {
@Override
public void closeComplete(Object ctx) {
closeFuture.complete(null);
}

@Override
public void closeFailed(ManagedLedgerException exception, Object ctx) {
log.warn().attr("managedLedger", managedLedger.getName()).exception(exception)
.log("Got exception when closing managed ledger");
closeFuture.complete(null);
}
}, null);
}
}));
return Futures.waitForAll(remainingFutures);

@void-ptr974 void-ptr974 Jun 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously this path used managedLedger.close(), which bounded the wait with AsyncOperationTimeoutSeconds before continuing shutdown. With the new asyncClose() + waitForAll flow, do we still want to keep a bounded wait here?

}).whenCompleteAsync((__, ___) -> {
//wait for tasks in scheduledExecutor executed.
openTelemetryManagedCursorStats.close();
Expand Down
Loading