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 15:13:26 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5578 4f788be45 -> 51e274040


5578


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

Branch: refs/heads/ignite-5578
Commit: 51e274040fd6238ca2222cbc3b4a4fc3cb19bc18
Parents: 4f788be
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jul 31 18:04:30 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jul 31 18:13:20 2017 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/CacheGroupContext.java |  2 +-
 .../preloader/GridDhtPartitionsExchangeFuture.java   | 12 ++++++++++--
 .../dht/preloader/InitNewCoordinatorFuture.java      | 15 ++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/51e27404/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 14eb362..209fe0a 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
@@ -341,7 +341,7 @@ public class CacheGroupContext {
     public GridCacheContext singleCacheContext() {
         List<GridCacheContext> caches = this.caches;
 
-        assert !sharedGroup() && caches.size() == 1;
+        assert !sharedGroup() && caches.size() == 1 : ctx.kernalContext().isStopping();
 
         return caches.get(0);
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/51e27404/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 87aee9b..e73e549 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
@@ -2343,8 +2343,13 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
 
                 onDone(exchCtx.events().topologyVersion(), err);
 
-                for (Map.Entry<UUID, GridDhtPartitionsSingleMessage> e : pendingSingleMsgs.entrySet())
+                for (Map.Entry<UUID, GridDhtPartitionsSingleMessage> e : pendingSingleMsgs.entrySet())
{
+                    log.info("Process pending message on coordinator [node=" + e.getKey()
+
+                        ", ver=" + initialVersion() +
+                        ", resVer=" + resTopVer + ']');
+
                     processSingleMessage(e.getKey(), e.getValue());
+                }
             }
         }
         catch (IgniteCheckedException e) {
@@ -2540,7 +2545,8 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
 
                 log.info("Send restore state response [node=" + node.id() +
                     ", exchVer=" + msg.restoreExchangeId().topologyVersion() +
-                    ", hasState=" + (finishState0 != null) + ']');
+                    ", hasState=" + (finishState0 != null) +
+                    ", affReq=" + !F.isEmpty(res.cacheGroupsAffinityRequest()) + ']');
 
                 res.finishMessage(finishState0 != null ? finishState0.msg : null);
 
@@ -3060,6 +3066,8 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
                     Map<Integer, CacheGroupAffinityMessage> joinedNodeAff = null;
 
                     for (Map.Entry<ClusterNode, GridDhtPartitionsSingleMessage> e :
msgs.entrySet()) {
+                        this.msgs.put(e.getKey().id(), e.getValue());
+
                         GridDhtPartitionsSingleMessage msg = e.getValue();
 
                         Collection<Integer> affReq = msg.cacheGroupsAffinityRequest();

http://git-wip-us.apache.org/repos/asf/ignite/blob/51e27404/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/InitNewCoordinatorFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/InitNewCoordinatorFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/InitNewCoordinatorFuture.java
index 015f8ff..b10aa45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/InitNewCoordinatorFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/InitNewCoordinatorFuture.java
@@ -37,6 +37,7 @@ import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
 import org.apache.ignite.internal.util.future.GridCompoundFuture;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.F;
 import org.jetbrains.annotations.Nullable;
 
 import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
@@ -198,7 +199,9 @@ public class InitNewCoordinatorFuture extends GridCompoundFuture {
      * @param msg Message.
      */
     public void onMessage(ClusterNode node, GridDhtPartitionsSingleMessage msg) {
-        log.info("Init new coordinator, received response [node=" + node.id() + ']');
+        log.info("Init new coordinator, received response [node=" + node.id() +
+            ", fullMsg=" + (msg.finishMessage() != null) +
+            ", affReq=" + !F.isEmpty(msg.cacheGroupsAffinityRequest()) + ']');
 
         assert msg.restoreState() : msg;
 
@@ -227,6 +230,9 @@ public class InitNewCoordinatorFuture extends GridCompoundFuture {
             restoreStateFut.onDone();
     }
 
+    /**
+     *
+     */
     private void onAllReceived() {
         if (fullMsg != null) {
             AffinityTopologyVersion resVer = fullMsg.resultTopologyVersion();
@@ -239,6 +245,10 @@ public class InitNewCoordinatorFuture extends GridCompoundFuture {
                 if (msgVer != null) {
                     assert msgVer.topologyVersion().compareTo(initTopVer) > 0 : msgVer;
 
+                    log.info("Process joined node message [resVer=" + resVer +
+                        ", initTopVer=" + initTopVer +
+                        ", msgVer=" + msgVer.topologyVersion() + ']');
+
                     if (msgVer.topologyVersion().compareTo(resVer) > 0)
                         it.remove();
                     else
@@ -257,6 +267,9 @@ public class InitNewCoordinatorFuture extends GridCompoundFuture {
 
                     assert msgVer.topologyVersion().compareTo(initTopVer) > 0 : msgVer;
 
+                    log.info("Process joined node message [initTopVer=" + initTopVer +
+                        ", msgVer=" + msgVer.topologyVersion() + ']');
+
                     if (joinExchMsgs == null)
                         joinExchMsgs = new HashMap<>();
 


Mime
View raw message