ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/3] ignite git commit: ignite-5075
Date Thu, 18 May 2017 07:33:48 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5075 f974c53b9 -> 103f68160


ignite-5075


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

Branch: refs/heads/ignite-5075
Commit: 2724fcb37d34b5ceab0da3a66ab985865f2a778a
Parents: d20b76c
Author: sboikov <sboikov@gridgain.com>
Authored: Thu May 18 01:54:30 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu May 18 01:54:30 2017 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/CacheAffinitySharedManager.java   | 5 +++--
 modules/core/src/test/config/examples.properties                | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/2724fcb3/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 f53ff07..cec42a8 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
@@ -462,7 +462,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
 
             cctx.cache().blockGateway(action.request());
 
-            if (crd && desc.cacheConfiguration().getCacheMode() != LOCAL) {
+            if (crd && lateAffAssign && desc.cacheConfiguration().getCacheMode()
!= LOCAL) {
                 CacheHolder cache = caches.remove(desc.cacheId());
 
                 assert cache != null : action.request();
@@ -1743,7 +1743,8 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
             assert ccfg != null : cacheDesc;
             assert ccfg.getCacheMode() != LOCAL : ccfg.getName();
 
-            assert !cctx.discovery().cacheAffinityNodes(ccfg.getName(), fut.topologyVersion()).contains(cctx.localNode());
+            assert !cctx.discovery().cacheAffinityNodes(ccfg.getName(),
+                fut.topologyVersion()).contains(cctx.localNode()) : cacheDesc.cacheName();
 
             AffinityFunction affFunc = cctx.cache().clone(ccfg.getAffinity());
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/2724fcb3/modules/core/src/test/config/examples.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/examples.properties b/modules/core/src/test/config/examples.properties
index c584f72..ea0d8ed 100644
--- a/modules/core/src/test/config/examples.properties
+++ b/modules/core/src/test/config/examples.properties
@@ -22,3 +22,4 @@ ScalarCacheExample=examples/config/example-ignite.xml
 ScalarCacheQueryExample=examples/config/example-ignite.xml
 ScalarCountGraphTrianglesExample=examples/config/example-ignite.xml
 ScalarPopularNumbersRealTimeExample=examples/config/example-ignite.xml
+MemoryPolicyExample=examples/config/example-memory-policies.xml
\ No newline at end of file


Mime
View raw message