ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/10] ignite git commit: IGNITE-6545: Failure during Ignite Service.cancel() can break normal shutdown process. This closes #2807.
Date Thu, 12 Oct 2017 11:24:15 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5932 178006226 -> b73792aec


IGNITE-6545: Failure during Ignite Service.cancel() can break normal shutdown process. This
closes #2807.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ffa1099
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ffa1099
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ffa1099

Branch: refs/heads/ignite-5932
Commit: 8ffa1099e2afd14052f7c91be822b2aa3f5f2a8d
Parents: 0f3546a
Author: AMRepo <andrey.mashenkov@gmail.com>
Authored: Tue Oct 10 11:57:20 2017 +0300
Committer: Andrey V. Mashenkov <andrey.mashenkov@gmail.com>
Committed: Wed Oct 11 12:00:26 2017 +0300

----------------------------------------------------------------------
 .../processors/service/GridServiceProcessor.java         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8ffa1099/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 9272760..6f1dfc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -316,7 +316,16 @@ public class GridServiceProcessor extends GridProcessorAdapter implements
Ignite
             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();
         }


Mime
View raw message