Skip to content

IGNITE-13832 Proper handling of interrupted exceptions in disco-notifier-worker. #8561

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

Closed
wants to merge 1 commit into from
Closed

IGNITE-13832 Proper handling of interrupted exceptions in disco-notifier-worker. #8561

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
21 changes: 11 additions & 10 deletions ...ore/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;

import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteClientDisconnectedException;
import org.apache.ignite.IgniteException;
Expand Down Expand Up @@ -101,6 +100,7 @@
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.P1;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.LT;
import org.apache.ignite.internal.util.typedef.internal.S;
Expand Down Expand Up @@ -2740,18 +2740,19 @@ public synchronized void submit(GridFutureAdapter notificationFut, Runnable cmd)
try {
body0();
}
catch (InterruptedException e) {
if (!isCancelled)
ctx.failure().process(new FailureContext(SYSTEM_WORKER_TERMINATION, e));

throw e;
}
catch (Throwable t) {
U.error(log, "Exception in discovery notyfier worker thread.", t);
boolean isInterruptedException = X.hasCause(t, InterruptedException.class)
|| X.hasCause(t, IgniteInterruptedException.class)
|| X.hasCause(t, IgniteInterruptedCheckedException.class);

FailureType type = t instanceof OutOfMemoryError ? CRITICAL_ERROR : SYSTEM_WORKER_TERMINATION;
if (!isInterruptedException)
U.error(log, "Exception in discovery notifier worker thread.", t);

ctx.failure().process(new FailureContext(type, t));
if (!isInterruptedException || !isCancelled) {
FailureType type = t instanceof OutOfMemoryError ? CRITICAL_ERROR : SYSTEM_WORKER_TERMINATION;

ctx.failure().process(new FailureContext(type, t));
}

throw t;
}
Expand Down