You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/07/28 13:52:05 UTC
ignite git commit: 6467
Repository: ignite
Updated Branches:
refs/heads/ignite-6467 7b76d7b43 -> 1e28093e8
6467
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e28093e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e28093e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e28093e
Branch: refs/heads/ignite-6467
Commit: 1e28093e82daff06565e549c5ef7d17ee0e039ea
Parents: 7b76d7b
Author: sboikov <sb...@apache.org>
Authored: Sat Jul 28 16:51:54 2018 +0300
Committer: sboikov <sb...@apache.org>
Committed: Sat Jul 28 16:51:54 2018 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtPartitionTopologyImpl.java | 5 +++--
.../dht/atomic/GridDhtAtomicAbstractUpdateFuture.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1e28093e/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 35afa6e..3b3cae5 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
@@ -1944,8 +1944,9 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
diffFromAffinityVer = affAssignment.topologyVersion();
- for (Map.Entry<Integer, Set<UUID>> e : diffFromAffinity.entrySet()) {
- TestDebugLog1.addPartMessage(grp.groupId(), e.getKey(), e.getValue(), "diff " + diffFromAffinityVer);
+ for (int i= 0; i < partitions(); i++) {
+ Set<UUID> diff = diffFromAffinity.get(i);
+ TestDebugLog1.addPartMessage(grp.groupId(), i, diff, "diff " + diffFromAffinityVer);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1e28093e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
index 29c7998..8b7ce78 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
@@ -186,7 +186,7 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridCacheFutureA
if (dhtNodes == null)
dhtNodes = affNodes;
- TestDebugLog1.addCacheEntryMessage(entry, dhtNodes, "dht map " + topVer + " " + updateReq.affinityMapping());
+ TestDebugLog1.addCacheEntryMessage(entry, U.nodeIds(dhtNodes), "dht map " + topVer + " " + updateReq.affinityMapping());
if (log.isDebugEnabled())
log.debug("Mapping entry to DHT nodes [nodes=" + U.nodeIds(dhtNodes) + ", entry=" + entry + ']');