ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [18/19] ignite git commit: 5578
Date Wed, 26 Jul 2017 10:53:34 GMT
5578


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

Branch: refs/heads/ignite-5578
Commit: 32c94ed18fbed83c3ee200aa1ef99e8e105e52e0
Parents: 39f668e
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Jul 26 13:52:28 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Jul 26 13:52:28 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridDhtLocalPartition.java   | 3 +++
 .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/32c94ed1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 725822d..a4c479f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -33,6 +33,7 @@ import java.util.concurrent.locks.ReentrantLock;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.TestDebugLog;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.NodeStoppingException;
@@ -203,6 +204,8 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl
implements
 
         rmvdEntryTtl = Long.getLong(IGNITE_CACHE_REMOVED_ENTRIES_TTL, 10_000);
 
+        TestDebugLog.addPartMessage(id, ctx.localNodeId(), "created");
+
         try {
             store = grp.offheap().createCacheDataStore(id);
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/32c94ed1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index d82d091..e03bf61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -1464,7 +1464,7 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology
{
             AffinityTopologyVersion affVer = grp.affinity().lastVersion();
 
             if (affVer.compareTo(diffFromAffinityVer) >= 0) {
-                AffinityAssignment affAssignment = grp.affinity().cachedAffinity(affVer);
+                AffinityAssignment affAssignment = grp.affinity().readyAffinity(affVer);
 
                 // Add new mappings.
                 for (Map.Entry<Integer, GridDhtPartitionState> e : parts.entrySet())
{


Mime
View raw message