Repository: ignite Updated Branches: refs/heads/ignite-6467 0082d5d06 -> 281ec2ee5
ignite-6467 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/281ec2ee Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/281ec2ee Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/281ec2ee Branch: refs/heads/ignite-6467 Commit: 281ec2ee558d75a6bd8dc423e59aaf887c08cf4c Parents: 0082d5d Author: sboikov <sboi...@apache.org> Authored: Sat Jul 28 15:45:42 2018 +0300 Committer: sboikov <sboi...@apache.org> Committed: Sat Jul 28 15:45:42 2018 +0300 ---------------------------------------------------------------------- .../dht/GridPartitionedSingleGetFuture.java | 10 ++++++++++ .../cache/distributed/CacheExchangeMergeTest.java | 14 +++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/281ec2ee/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java index 0e163c5..a57ff20 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java @@ -309,6 +309,8 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec recovery); try { + TestDebugLog1.addEntryMessage(cctx.cacheId(), key, node.id(), "snd req"); + cctx.io().send(node, req, cctx.ioPolicy()); } catch (IgniteCheckedException e) { @@ -367,6 +369,8 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec * @return {@code True} if future completed. */ private boolean localGet(AffinityTopologyVersion topVer, int part) { + TestDebugLog1.addEntryMessage(cctx.cacheId(), key, topVer, "local get"); + assert cctx.affinityNode() : this; GridDhtCacheAdapter colocated = cctx.dht(); @@ -547,6 +551,8 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec * @param res Result. */ @Override public void onResult(UUID nodeId, GridNearGetResponse res) { + TestDebugLog1.addEntryMessage(cctx.cacheId(), key, nodeId, "get res2 " + topVer); + if (!processResponse(nodeId) || !checkError(res.error(), !F.isEmpty(res.invalidPartitions()), res.topologyVersion(), nodeId)) return; @@ -723,6 +729,8 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec /** {@inheritDoc} */ @Override public boolean onNodeLeft(UUID nodeId) { + TestDebugLog1.addEntryMessage(cctx.cacheId(), key, nodeId, "node left"); + if (!processResponse(nodeId)) return false; @@ -752,6 +760,8 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec * @param topVer Topology version. */ private void remap(final AffinityTopologyVersion topVer) { + TestDebugLog1.addEntryMessage(cctx.cacheId(), key, topVer, "remap"); + cctx.closures().runLocalSafe(new Runnable() { @Override public void run() { map(topVer); http://git-wip-us.apache.org/repos/asf/ignite/blob/281ec2ee/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java index d8d989a..395147e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java @@ -110,7 +110,7 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { private boolean testDelaySpi; /** */ - private static String[] cacheNames = {"c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10"}; + private static String[] cacheNames = {"c1", "c2", "c3", "c4", "c5"/*, "c6", "c7", "c8", "c9", "c10"*/}; /** */ private boolean cfgCache = true; @@ -153,12 +153,12 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { cacheConfiguration("c2", ATOMIC, PARTITIONED, 1), cacheConfiguration("c3", ATOMIC, PARTITIONED, 2), cacheConfiguration("c4", ATOMIC, PARTITIONED, 10), - cacheConfiguration("c5", ATOMIC, REPLICATED, 0), - cacheConfiguration("c6", TRANSACTIONAL, PARTITIONED, 0), - cacheConfiguration("c7", TRANSACTIONAL, PARTITIONED, 1), - cacheConfiguration("c8", TRANSACTIONAL, PARTITIONED, 2), - cacheConfiguration("c9", TRANSACTIONAL, PARTITIONED, 10), - cacheConfiguration("c10", TRANSACTIONAL, REPLICATED, 0) + cacheConfiguration("c5", ATOMIC, REPLICATED, 0) +// cacheConfiguration("c6", TRANSACTIONAL, PARTITIONED, 0), +// cacheConfiguration("c7", TRANSACTIONAL, PARTITIONED, 1), +// cacheConfiguration("c8", TRANSACTIONAL, PARTITIONED, 2), +// cacheConfiguration("c9", TRANSACTIONAL, PARTITIONED, 10), +// cacheConfiguration("c10", TRANSACTIONAL, REPLICATED, 0) ); }
