IGNITE-28189

Author: petrov-mg

modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java

@@ -63,7 +63,6 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.util.worker.GridWorker;
 import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.lang.IgniteRunnable;
 import org.apache.ignite.lang.IgniteUuid;
 import org.apache.ignite.marshaller.Marshaller;
 import org.jetbrains.annotations.Nullable;
@@ -734,39 +733,33 @@ else if (isNodeStopping && X.hasCause(e, InterruptedException.class, IgniteInter
      * @param sys System flag.
      */
     public void cancel(boolean sys) {
-        try {
-            if (log.isDebugEnabled())
-                log.debug("Cancelling job: " + ses);
-
-            boolean firstCancel = isCancelled.compareAndSet(false, true);
+        if (log.isDebugEnabled())
+            log.debug("Cancelling job: " + ses);
 
-            isCancelledBySystem = sys;
+        boolean firstCancel = isCancelled.compareAndSet(false, true);
 
-            status = CANCELLED;
+        isCancelledBySystem = sys;
 
-            final ComputeJob job0 = job;
+        status = CANCELLED;
 
-            U.wrapThreadLoader(dep.classLoader(), (IgniteRunnable)() -> {
-                try (Scope ignored = ctx.security().withContext(secCtx)) {
-                    job0.cancel();
-                }
-            });
+        final ComputeJob job0 = job;
 
-            // Interrupting only when all 'cancelled' flags are set.
-            // This allows the 'job' to determine it's a cancellation.
-            onCancel(firstCancel);
-
-            if (!internal && ctx.event().isRecordable(EVT_JOB_CANCELLED))
-                recordEvent(EVT_JOB_CANCELLED, "Job was cancelled: " + job0);
+        try (Scope ignored = ctx.security().withContext(secCtx)) {
+            U.wrapThreadLoader(dep.classLoader(), job0::cancel);
         }
-        // Catch throwable to protect against bad user code.
-        catch (Throwable e) {
+        catch (Throwable e) { // Catch throwable to protect against bad user code.
             U.error(log, "Failed to cancel job due to undeclared user exception [jobId=" + ses.getJobId() +
                 ", ses=" + ses + ']', e);
 
             if (e instanceof Error)
                 throw e;
         }
+        finally {
+            onCancel(firstCancel);
+
+            if (!internal && ctx.event().isRecordable(EVT_JOB_CANCELLED))
+                recordEvent(EVT_JOB_CANCELLED, "Job was cancelled: " + job0);
+        }
     }
 
     /**