ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: Ignite 1924
Date Tue, 24 Nov 2015 13:54:08 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1924 27e1ae277 -> c08c73efe


Ignite 1924


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

Branch: refs/heads/ignite-1924
Commit: c08c73efe1859eb09d748e6c4c98ae5e51741b6a
Parents: 27e1ae2
Author: Anton Vinogradov <av@apache.org>
Authored: Tue Nov 24 16:53:55 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Tue Nov 24 16:53:55 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCachePartitionExchangeManager.java      | 2 ++
 .../distributed/dht/preloader/GridDhtPartitionDemander.java      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c08c73ef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index f7662d3..451dbc7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -334,6 +334,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
 
                 cctx.io().addOrderedHandler(rebalanceTopic(cnt), new CI2<UUID, GridCacheMessage>()
{
                     @Override public void apply(final UUID id, final GridCacheMessage m)
{
+                        U.log(log, "E1>> " + m.cacheId);
+
                         if (!enterBusy())
                             return;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c08c73ef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 9d0879b..66c7f20 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -416,10 +416,12 @@ public class GridDhtPartitionDemander {
                         synchronized (fut) {
                             if (!fut.isDone())// Future can be already cancelled at this
moment and all failovers happened.
                                 // New requests will not be covered by failovers.
+                            {
                                 cctx.io().sendOrderedMessage(node,
                                     rebalanceTopics.get(cnt), initD, cctx.ioPolicy(), initD.timeout());
 
-                            U.log(log, "D1>> " + cctx.name() + " " + initD.partitions().toString()
+ node.id() + " " + fut.isDone());
+                                U.log(log, "D1>> " + cctx.name() + " " + initD.partitions().toString()
+ node.id() + " " + fut.isDone());
+                            }
 
                         }
 


Mime
View raw message