ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ag...@apache.org
Subject ignite git commit: ignite-7340 Fix flaky GridServiceProcessorMultiNodeConfigSelfTest#checkDeployOnEachNodeUpdateTopology
Date Thu, 11 Jan 2018 13:49:02 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 65e1c5779 -> 6136ecd1a


ignite-7340 Fix flaky GridServiceProcessorMultiNodeConfigSelfTest#checkDeployOnEachNodeUpdateTopology

Signed-off-by: Andrey Gura <agura@apache.org>


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

Branch: refs/heads/master
Commit: 6136ecd1a92cac26894c74a306b3df6d5646c524
Parents: 65e1c57
Author: dkarachentsev <dkarachentsev@gridgain.com>
Authored: Thu Jan 11 16:48:43 2018 +0300
Committer: Andrey Gura <agura@apache.org>
Committed: Thu Jan 11 16:48:43 2018 +0300

----------------------------------------------------------------------
 .../internal/processors/service/GridServiceProcessor.java    | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6136ecd1/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 8581023..6df107b 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
@@ -1289,6 +1289,14 @@ public class GridServiceProcessor extends GridProcessorAdapter implements
Ignite
      * @param assigns Assignments.
      */
     private void redeploy(GridServiceAssignments assigns) {
+        if (assigns.topologyVersion() < ctx.discovery().topologyVersion()) {
+            if (log.isDebugEnabled())
+                log.debug("Skip outdated assignment [assigns=" + assigns +
+                    ", topVer=" + ctx.discovery().topologyVersion() + ']');
+
+            return;
+        }
+
         String svcName = assigns.name();
 
         Integer assignCnt = assigns.assigns().get(ctx.localNodeId());


Mime
View raw message