ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [48/50] ignite git commit: Call GridDhtPartitionTopology.onExchange done for each group, not cache.
Date Tue, 20 Jun 2017 06:00:50 GMT
Call GridDhtPartitionTopology.onExchange done for each group, not cache.


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

Branch: refs/heads/ignite-2.1.2-exchange
Commit: 9bf4ca4987a0b4eeddb857db6941efbe1bec9690
Parents: 2503f9e
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Jun 20 07:47:11 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Jun 20 07:47:11 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/CacheGroupContext.java    | 2 +-
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java         | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9bf4ca49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
index 4a66a85..c3ddc5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
@@ -540,7 +540,7 @@ public class CacheGroupContext {
      */
     public GridDhtPartitionTopology topology() {
         if (top == null)
-            throw new IllegalStateException("Topology is not initialized: " + name());
+            throw new IllegalStateException("Topology is not initialized: " + cacheOrGroupName());
 
         return top;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/9bf4ca49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 5f416da..230a25c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1299,8 +1299,10 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
         cctx.database().releaseHistoryForExchange();
 
         if (err == null && realExchange) {
-            for (CacheGroupContext grp : cctx.cache().cacheGroups())
-                grp.topology().onExchangeDone(grp.affinity().cachedAffinity(topologyVersion()));
+            for (CacheGroupContext grp : cctx.cache().cacheGroups()) {
+                if (!grp.isLocal())
+                    grp.topology().onExchangeDone(grp.affinity().cachedAffinity(topologyVersion()));
+            }
         }
 
         if (super.onDone(res, err) && realExchange) {


Mime
View raw message