Skip to content

fix(consumers): prevent await deadlock on ContextCallable failure #2941

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

Merged
imbajin merged 5 commits into from
Jan 26, 2026
Merged

fix(consumers): prevent await deadlock on ContextCallable failure #2941

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f3578c
fix(consumers): prevent await deadlock on ContextCallable failure
bitflicker64 Jan 20, 2026
b7d845d
test(consumers): add unit tests for start/await
bitflicker64 Jan 21, 2026
260e4ea
Fix Consumers await() latch deadlock when ContextCallable fails
bitflicker64 Jan 22, 2026
0c4a0ce
Add regression test to prevent await() deadlock on ContextCallable fa…
bitflicker64 Jan 24, 2026
ec746c9
Update ConsumersTest.java
bitflicker64 Jan 24, 2026
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
20 changes: 17 additions & 3 deletions hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/util/Consumers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,26 @@ public void start(String name) {
LOG.info("Starting {} workers[{}] with queue size {}...",
this.workers, name, this.queueSize);
for (int i = 0; i < this.workers; i++) {
this.runningFutures.add(
this.executor.submit(new ContextCallable<>(this::runAndDone)));
this.runningFutures.add(this.executor.submit(this::safeRun));
}

}
private Void safeRun() {
Comment thread
bitflicker64 marked this conversation as resolved.
Outdated
try {
new ContextCallable<>(this::runAndDone).call();
Comment thread
bitflicker64 marked this conversation as resolved.
Outdated
} catch (Throwable e) {
Comment thread
bitflicker64 marked this conversation as resolved.
Outdated
LOG.error("Worker failed before runAndDone()", e);
Comment thread
bitflicker64 marked this conversation as resolved.
Outdated
if (this.exception == null) {
this.exception = e;
}
exceptionHandle(e);
Comment thread
bitflicker64 marked this conversation as resolved.
Outdated
} finally {
this.latch.countDown();
}
return null;
}


private Void runAndDone() {
try {
this.run();
Expand All @@ -124,7 +139,6 @@ private Void runAndDone() {
exceptionHandle(e);
} finally {
this.done();
this.latch.countDown();
}
return null;
}
Expand Down
Loading