ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [6/6] ignite git commit: 5578
Date Tue, 01 Aug 2017 07:13:44 GMT
5578


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

Branch: refs/heads/ignite-5578
Commit: 57579bb1528b9834bd0652bcdba8cf5db3597e14
Parents: 14e7268
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Aug 1 10:13:31 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Aug 1 10:13:31 2017 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java      | 4 ++--
 .../distributed/dht/preloader/InitNewCoordinatorFuture.java | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/57579bb1/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 e73e549..bb39cea 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
@@ -2499,7 +2499,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
                 case CLIENT:
                 case SRV: {
                     if (!cctx.discovery().alive(node)) {
-                        log.info("Ignore restore state request, node is not alive [node="
+ node.id() + ']');
+                        log.info("Ignore partitions request, node is not alive [node=" +
node.id() + ']');
 
                         return;
                     }
@@ -2507,7 +2507,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
                     if (msg.restoreState()) {
                         if (!node.equals(crd)) {
                             if (node.order() > crd.order()) {
-                                log.info("Received restore state request, change coordinator
[oldCrd=" + crd.id() +
+                                log.info("Received partitions request, change coordinator
[oldCrd=" + crd.id() +
                                     ", newCrd=" + node.id() + ']');
 
                                 crd = node; // Do not allow to process FullMessage from old
coordinator.

http://git-wip-us.apache.org/repos/asf/ignite/blob/57579bb1/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 b10aa45..71db8ad 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
@@ -135,11 +135,11 @@ public class InitNewCoordinatorFuture extends GridCompoundFuture {
                             joinedNodes.put(node.id(), exchId);
                         }
                     }
-
-                    if (joinedNodes == null)
-                        joinedNodes = Collections.emptyMap();
                 }
 
+                if (joinedNodes == null)
+                    joinedNodes = Collections.emptyMap();
+
                 if (!awaited.isEmpty()) {
                     restoreStateFut = new GridFutureAdapter();
 
@@ -147,6 +147,9 @@ public class InitNewCoordinatorFuture extends GridCompoundFuture {
                 }
             }
 
+            log.info("Try restore exchange result [allNodes=" + awaited +
+                ", joined=" + joinedNodes.keySet() +  ']');
+
             if (!nodes.isEmpty()) {
                 GridDhtPartitionsSingleRequest req = GridDhtPartitionsSingleRequest.restoreStateRequest(exchFut.exchangeId(),
                     exchFut.exchangeId());


Mime
View raw message