Skip to content

fix(store-client): stop retrying after DEADLINE_EXCEEDED and honour thread interrupts in NodeTxExecutor #3204

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
SebastianGruza wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(store-client): stop retrying after DEADLINE_EXCEEDED and honour thread interrupts in NodeTxExecutor #3204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
920bbbd
fix(store-client): stop retrying a commit after DEADLINE_EXCEEDED and…
SebastianGruza Sep 10, 2026
4350ef9
test(store-client): cover retry classification, deadline fail-fast an…
SebastianGruza Sep 10, 2026
8adf522
fix(store-client): decide retry on every failure of a parallel commit…
SebastianGruza Sep 10, 2026
b588aa8
fix(store-client): retry DEADLINE_EXCEEDED exactly once so a moved pa…
SebastianGruza Sep 11, 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
197 changes: 150 additions & 47 deletions ...store/hg-store-client/src/main/java/org/apache/hugegraph/store/client/NodeTxExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,18 @@
import static org.apache.hugegraph.store.client.util.HgStoreClientConst.TX_SESSIONS_MAP_CAPACITY;

import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collector;
Expand All @@ -46,6 +51,8 @@
import org.apache.hugegraph.store.term.HgPair;
import org.apache.hugegraph.store.term.HgTriple;

import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import lombok.extern.slf4j.Slf4j;

/**
Expand Down Expand Up @@ -129,35 +136,7 @@ void doCommit() {
if (!allSuccess.get()) {
throw HgStoreClientException.of(msg);
}
AtomicReference<Throwable> throwable = new AtomicReference<>();
Collection<HgStoreSession> sessions = this.sessions.values();
sessions.parallelStream().forEach(e -> {
if (e.isTx()) {
try {
e.commit();
} catch (Throwable t) {
throwable.compareAndSet(null, t);
allSuccess.set(false);
}
}
});
if (!allSuccess.get()) {
if (isTx) {
try {
sessions.stream().forEach(HgStoreSession::rollback);
} catch (Exception e) {

}
}
Throwable cause = throwable.get();
if (cause.getCause() != null) {
cause = cause.getCause();
}
if (cause instanceof HgStoreClientException) {
throw (HgStoreClientException) cause;
}
throw HgStoreClientException.of(cause);
}
this.commitSessions(this.sessions.values());
return true;
});

Expand Down Expand Up @@ -232,6 +211,52 @@ void doCommit() {
// }
// };

/**
* Commit every tx session in parallel. When at least one commit fails, roll back (in tx
* mode) and throw one exception that carries ALL failures: the first one as the cause, the
* others as suppressed. The retry loop looks at all of them, so whether a commit is retried
* no longer depends on which partition happened to fail first.
*/
void commitSessions(Collection<HgStoreSession> sessions) {
Queue<Throwable> failures = new ConcurrentLinkedQueue<>();
sessions.parallelStream().forEach(e -> {
if (e.isTx()) {
try {
e.commit();
} catch (Throwable t) {
failures.add(t);
}
}
});
if (failures.isEmpty()) {
return;
}
if (isTx) {
try {
sessions.stream().forEach(HgStoreSession::rollback);
} catch (Exception e) {
// keep the commit failure as the reported one
}
}
throw aggregate(failures);
}

static HgStoreClientException aggregate(Collection<Throwable> failures) {
Iterator<Throwable> it = failures.iterator();
Throwable first = it.next();
Throwable cause = first.getCause() != null ? first.getCause() : first;
HgStoreClientException result = cause instanceof HgStoreClientException ?
(HgStoreClientException) cause :
HgStoreClientException.of(cause);
while (it.hasNext()) {
Throwable other = it.next();
if (other != result && other != cause) {
result.addSuppressed(other);
}
}
return result;
}

private boolean doAction(HgTriple<String, HgOwnerKey, Object> nodeParams,
Function<NodeTkv, Boolean> action) {
if (nodeParams.getZ() == null) {
Expand Down Expand Up @@ -373,35 +398,65 @@ boolean ifAnyTrue(Supplier<Stream<HgPair<HgStoreNode, NodeTkv>>> nodeStreamSuppl
}

<T> Optional<T> retryingInvoke(Supplier<T> supplier) {
boolean[] deadlineRetried = {false};
return IntStream.rangeClosed(0, NODE_MAX_RETRYING_TIMES).boxed()
.map(
i -> {
if (Thread.currentThread().isInterrupted()) {
// The caller (e.g. a REST worker hitting
// restserver.request_timeout) gave up: stop
// retrying instead of holding its thread.
throw HgStoreClientException.of(

@bitflicker64 bitflicker64 Sep 11, 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.

🧹 Two of the new interrupt exits drop the InterruptedException, so the server cannot tell them apart from a store failure.

Evidence:

  • :409-410 throws HgStoreClientException.of("Interrupted before retry " + i) with no cause. :456-458 uses the store failure t as the cause and discards e. Neither has an InterruptedException as its root cause.
  • The FATAL path keeps one. A blocking stub on an interrupted thread fails with CANCELLED, and the InterruptedException is its cause: grpc-stub 1.39.0 ClientCalls.blockingUnaryCall calls call.cancel("Thread interrupted", e).
  • HugeException.isInterrupted() only checks the root cause (HugeException.java:56-61). HugeTask.fail() relies on it so that a cancelled task is not recorded as failed (HugeTask.java:351-355). Take a task that is cancelled while its thread is between store calls or in the retry sleep. It now logs a WARN with a stack trace. If the worker reaches fail() before cancel() sets CANCELLED (:323 interrupts, :336 sets the status), the task is stored as FAILED and cancel() returns false, so DistributedTaskScheduler.cancel() does not save CANCELLED (:317-321). Before this change the loop swallowed the interrupt and carried on, so this path did not exist.

Requested change: make InterruptedException the root cause on both exits. For example, use HgStoreClientException.of("Interrupted before retry " + i, new InterruptedException()). In the sleep handler, use HgStoreClientException.of("Interrupted while waiting to retry: " + t.getMessage(), e) and attach t with addSuppressed. Then extend testInterruptStopsRetrying and testInterruptBeforeCallSkipsTheAttempt to assert the root cause.

"Interrupted before retry " + i);
}
T buffer = null;
try {
buffer = supplier.get();
} catch (Throwable t) {
if (i + 1 <= NODE_MAX_RETRYING_TIMES) {
try {
int sleepTime;
// The first three times try once every second
if (i < 3) {
sleepTime = 1;
} else {
// Subsequent incremental
sleepTime = i - 1;
}
log.info("Waiting {} seconds " +
"for the next try.",
sleepTime);
Thread.sleep(sleepTime * 1000L);
} catch (InterruptedException e) {
log.error("Failed to sleep", e);
Failure failure = classify(t);
if (failure == Failure.FATAL) {
// The caller's thread was interrupted or the
// call was cancelled: fail fast.
log.warn("Not retrying after: {}",
t.getMessage(), t);
throw HgStoreClientException.of(
t.getMessage(), t);
}
if (failure == Failure.DEADLINE) {
// One retry: the NOT_WORK notice sent for the
// failed RPC reloads the partition leaders, so
// the next attempt can reach a new leader. A
// second deadline in a row would only wait the
// full deadline again on the same stalled store.
if (deadlineRetried[0]) {
log.warn("Not retrying a second deadline: {}",
t.getMessage(), t);
throw HgStoreClientException.of(
t.getMessage(), t);
}
} else {
deadlineRetried[0] = true;
log.warn("Deadline exceeded, retrying once in " +
"case the partition leader moved: {}",
t.getMessage());
}
if (i + 1 > NODE_MAX_RETRYING_TIMES) {
log.error(maxTryMsg, t);
throw HgStoreClientException.of(
t.getMessage(), t);
}
// The first three times try once every second,
// subsequent incremental
int sleepTime = i < 3 ? 1 : i - 1;
log.info("Waiting {} seconds for the next try.",
sleepTime);
try {
Thread.sleep(sleepTime * 1000L);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw HgStoreClientException.of(
"Interrupted while waiting to retry: " +
t.getMessage(), t);
}
}
return buffer;
}
Expand All @@ -411,6 +466,54 @@ <T> Optional<T> retryingInvoke(Supplier<T> supplier) {

}

/**
* How a failed attempt is treated by {@link #retryingInvoke}: FATAL is never retried (the
* caller's thread was interrupted, or the call was cancelled), DEADLINE is retried exactly
* once (the partition leader may have moved after the failed RPC invalidated the partition
* cache; a second deadline in a row would only wait the full deadline again on the same
* stalled store), everything else (transport errors, NOT_LEADER, store replacement) is
* retried up to NODE_MAX_RETRYING_TIMES as before. For a parallel commit the failures of
* the other partitions arrive as suppressed exceptions and are classified too; the most
* severe class wins.
*/
enum Failure {
RETRYABLE, DEADLINE, FATAL
}

static Failure classify(Throwable t) {
return classify(t, Collections.newSetFromMap(new IdentityHashMap<>()));
}

private static Failure classify(Throwable t, Set<Throwable> seen) {
Failure worst = Failure.RETRYABLE;
Throwable c = t;
while (c != null && seen.add(c)) {
if (c instanceof InterruptedException) {
return Failure.FATAL;
}
if (c instanceof StatusRuntimeException) {
Status.Code code = ((StatusRuntimeException) c).getStatus().getCode();
if (code == Status.Code.CANCELLED) {
return Failure.FATAL;
}
if (code == Status.Code.DEADLINE_EXCEEDED) {
worst = Failure.DEADLINE;
}
}
for (Throwable suppressed : c.getSuppressed()) {
Failure f = classify(suppressed, seen);
if (f == Failure.FATAL) {
return f;
}
if (f.compareTo(worst) > 0) {
worst = f;
}
}
c = c.getCause();
}
return worst;
}

private boolean isValid(Object obj) {
if (obj == null) {
return false;
Expand Down
Loading