ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: 5578
Date Mon, 31 Jul 2017 07:33:00 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5578 593fb6d63 -> d0766ed86


5578


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

Branch: refs/heads/ignite-5578
Commit: d0766ed86ff116b5992d36b41307bd002e3f93a4
Parents: 593fb6d
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jul 31 10:32:55 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jul 31 10:32:55 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/CacheAffinitySharedManager.java         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d0766ed8/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 83503dd..383028e 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
@@ -1369,7 +1369,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
 
         assert evts.serverLeft();
 
-        log.info("mergeExchangesInitAffinityOnServerLeft [topVer=" + evts.discoveryCache().version()
+ ']');
+        log.info("mergeExchangesInitAffinityOnServerLeft [topVer=" + evts.topologyVersion()+
']');
 
         forAllRegisteredCacheGroups(new IgniteInClosureX<CacheGroupDescriptor>() {
             @Override public void applyx(CacheGroupDescriptor desc) throws IgniteCheckedException
{
@@ -1377,7 +1377,11 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
 
                 CacheGroupHolder cache = groupHolder(topVer, desc);
 
-                cache.affinity().calculate(topVer, evts.lastEvent(), evts.discoveryCache());
+                List<List<ClusterNode>> assign =
+                    cache.affinity().calculate(topVer, evts.lastEvent(), evts.discoveryCache());
+
+                if (!cache.rebalanceEnabled)
+                    cache.affinity().initialize(topVer, assign);
             }
         });
 


Mime
View raw message