ignite-gg-11650 Stabilize 8.0.2.ea1 cancel deployment fut if deactivate
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6d45ace3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6d45ace3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6d45ace3 Branch: refs/heads/ignite-3477 Commit: 6d45ace3faad9b491c11b64a01f1f9d093201b8a Parents: c1fd8aa Author: Dmitriy Govorukhin <[email protected]> Authored: Fri Dec 23 12:28:04 2016 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Fri Dec 23 12:28:04 2016 +0300 ---------------------------------------------------------------------- .../processors/cluster/GridClusterStateProcessor.java | 12 ++++++------ .../processors/service/GridServiceProcessor.java | 6 +++++- 2 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6d45ace3/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index 725c9f3..55061fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@ -379,6 +379,12 @@ public class GridClusterStateProcessor extends GridProcessorAdapter { // revert change if activation request fail if (actx.activate) { try { + cacheProc.onKernalStopCaches(true); + + cacheProc.stopCaches(true); + + sharedCtx.affinity().removeAllCacheInfo(); + if (!ctx.clientNode()) { sharedCtx.database().onDeActivate(ctx); @@ -387,12 +393,6 @@ public class GridClusterStateProcessor extends GridProcessorAdapter { sharedCtx.wal().onDeActivate(ctx); } - - cacheProc.onKernalStopCaches(true); - - cacheProc.stopCaches(true); - - sharedCtx.affinity().removeAllCacheInfo(); } catch (Exception e) { for (Map.Entry<UUID, Exception> entry : exs.entrySet()) http://git-wip-us.apache.org/repos/asf/ignite/blob/6d45ace3/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 c63ffd4..ac50ef2 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 @@ -376,11 +376,15 @@ public class GridServiceProcessor extends GridProcessorAdapter implements Ignite } /** {@inheritDoc} */ - @Override public void onDeActivate(GridKernalContext kctx) { + @Override public void onDeActivate(GridKernalContext kctx) throws IgniteCheckedException { if (log.isDebugEnabled()) log.debug("DeActivate service processor [nodeId=" + ctx.localNodeId() + " topVer=" + ctx.discovery().topologyVersionEx() + " ]"); + cancelFutures(depFuts, new IgniteCheckedException("Failed to deploy service, cluster in active.")); + + cancelFutures(undepFuts, new IgniteCheckedException("Failed to undeploy service, cluster in active.")); + onKernalStop(true); }
