ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df5d49f8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df5d49f8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df5d49f8 Branch: refs/heads/ignite-5075-pds Commit: df5d49f83bbd41f4e37bc7cf07c1f51b30974b00 Parents: 1471941 Author: sboikov <[email protected]> Authored: Fri Jun 2 11:59:26 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Jun 2 11:59:26 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtCacheAdapter.java | 4 +--- .../cache/distributed/near/GridNearSingleGetResponse.java | 2 +- .../internal/processors/cache/IgniteCacheGroupsTest.java | 7 +++++++ 3 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df5d49f8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index 71ab741..4afa257 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -933,7 +933,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap res = new GridNearSingleGetResponse(ctx.cacheId(), req.futureId(), - req.topologyVersion(), + null, res0, false, req.addDeploymentInfo()); @@ -1033,8 +1033,6 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap if (!F.isEmpty(fut.invalidPartitions())) res.invalidPartitions(fut.invalidPartitions(), ctx.shared().exchange().readyAffinityVersion()); - else - res.invalidPartitions(fut.invalidPartitions(), req.topologyVersion()); try { ctx.io().send(nodeId, res, ctx.ioPolicy()); http://git-wip-us.apache.org/repos/asf/ignite/blob/df5d49f8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java index 1ff5c00..2cb75c2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java @@ -115,7 +115,7 @@ public class GridNearSingleGetResponse extends GridCacheIdMessage implements Gri * @return Topology version. */ @Override public AffinityTopologyVersion topologyVersion() { - return topVer; + return topVer != null ? topVer : super.topologyVersion(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/df5d49f8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java index 587537d..fd28da0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java @@ -148,6 +148,11 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ + @Override protected long getTestTimeout() { + return 10 * 60_000; + } + + /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { stopAllGrids(); @@ -1300,6 +1305,8 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest { } } + log.info("Stop nodes."); + GridTestUtils.runMultiThreaded(new IgniteInClosure<Integer>() { @Override public void apply(Integer idx) { stopGrid(idx);
