You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/02/15 12:47:56 UTC

ignite git commit: IGNITE-7694 Fixed assertion on lastAffVer

Repository: ignite
Updated Branches:
  refs/heads/ignite-7694 31f59aeaa -> 99f98fccd


IGNITE-7694 Fixed assertion on lastAffVer


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

Branch: refs/heads/ignite-7694
Commit: 99f98fccd061fe98e6f4f612ad06c5474613e944
Parents: 31f59ae
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Feb 15 15:47:47 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Feb 15 15:47:47 2018 +0300

----------------------------------------------------------------------
 .../cache/CacheAffinitySharedManager.java           | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/99f98fcc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 1cfcc9c..8ee505c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -148,13 +148,6 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
         cctx.kernalContext().event().addLocalEventListener(discoLsnr, EVT_NODE_LEFT, EVT_NODE_FAILED);
     }
 
-    /** {@inheritDoc} */
-    @Override public void onDisconnected(IgniteFuture<?> reconnectFut) {
-        synchronized (mux) {
-            lastAffVer = null;
-        }
-    }
-
     /**
      * Callback invoked from discovery thread when discovery message is received.
      *
@@ -169,17 +162,18 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
         ClusterNode node,
         AffinityTopologyVersion topVer,
         DiscoveryDataClusterState state) {
+        if (type == EVT_NODE_JOINED && node.isLocal())
+            lastAffVer = null;
+
         if ((state.transition() || !state.active()) &&
             !DiscoveryCustomEvent.requiresCentralizedAffinityAssignment(customMsg))
             return;
 
-        if (type == EVT_NODE_JOINED && node.isLocal())
-            lastAffVer = null;
-
         if ((!CU.clientNode(node) && (type == EVT_NODE_FAILED || type == EVT_NODE_JOINED || type == EVT_NODE_LEFT)) ||
             DiscoveryCustomEvent.requiresCentralizedAffinityAssignment(customMsg)) {
             synchronized (mux) {
-                assert lastAffVer == null || topVer.compareTo(lastAffVer) > 0 : "lastAffVer=" + lastAffVer + ", topVer=" + topVer;
+                assert lastAffVer == null || topVer.compareTo(lastAffVer) > 0 :
+                    "lastAffVer=" + lastAffVer + ", topVer=" + topVer + ", customMsg=" + customMsg;
 
                 lastAffVer = topVer;
             }