IGNITE-6545: Failure during Ignite Service.cancel() can break normal …

…shutdown process. This closes apache#2807.
gridgain · Oct 11, 2017 · 8ffa109 · 8ffa109
1 parent 0f3546a
commit 8ffa109
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/...ore/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/...ore/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -316,7 +316,16 @@ public void updateUtilityCache() {
             Service svc = ctx.service();
 
             if (svc != null)
-                svc.cancel(ctx);
+                try {
+                    svc.cancel(ctx);
+                }
+                catch (Throwable e) {
+                    log.error("Failed to cancel service (ignoring) [name=" + ctx.name() +
+                        ", execId=" + ctx.executionId() + ']', e);
+
+                    if (e instanceof Error)
+                        throw e;
+                }
 
             ctx.executor().shutdownNow();
         }