IGNITE-6520: Using actual AffinityReadyFuture result
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9160d5ea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9160d5ea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9160d5ea Branch: refs/heads/ignite-3478 Commit: 9160d5eaf75d07ef16f6fe02b09aaa2ed76132b5 Parents: 013d7db Author: Andrey Kuznetsov <[email protected]> Authored: Mon Oct 2 11:28:32 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Oct 2 11:28:32 2017 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridPartitionedGetFuture.java | 6 ++---- .../cache/distributed/dht/GridPartitionedSingleGetFuture.java | 6 ++---- .../processors/cache/distributed/near/GridNearGetFuture.java | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9160d5ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index 73c0ea5..015eb82 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -713,17 +713,15 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda onDone(Collections.<K, V>emptyMap()); } else { - final AffinityTopologyVersion updTopVer = + AffinityTopologyVersion updTopVer = new AffinityTopologyVersion(Math.max(topVer.topologyVersion() + 1, cctx.discovery().topologyVersion())); cctx.affinity().affinityReadyFuture(updTopVer).listen( new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() { @Override public void apply(IgniteInternalFuture<AffinityTopologyVersion> fut) { try { - fut.get(); - // Remap. - map(keys.keySet(), F.t(node, keys), updTopVer); + map(keys.keySet(), F.t(node, keys), fut.get()); onDone(Collections.<K, V>emptyMap()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/9160d5ea/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 234ee91..61489e5 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 @@ -703,16 +703,14 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec return false; if (canRemap) { - final AffinityTopologyVersion updTopVer = new AffinityTopologyVersion( + AffinityTopologyVersion updTopVer = new AffinityTopologyVersion( Math.max(topVer.topologyVersion() + 1, cctx.discovery().topologyVersion())); cctx.affinity().affinityReadyFuture(updTopVer).listen( new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() { @Override public void apply(IgniteInternalFuture<AffinityTopologyVersion> fut) { try { - fut.get(); - - remap(updTopVer); + remap(fut.get()); } catch (IgniteCheckedException e) { onDone(e); http://git-wip-us.apache.org/repos/asf/ignite/blob/9160d5ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index 807270d..2361507 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -917,17 +917,15 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap onDone(Collections.<K, V>emptyMap()); } else { - final AffinityTopologyVersion updTopVer = + AffinityTopologyVersion updTopVer = new AffinityTopologyVersion(Math.max(topVer.topologyVersion() + 1, cctx.discovery().topologyVersion())); cctx.affinity().affinityReadyFuture(updTopVer).listen( new CI1<IgniteInternalFuture<AffinityTopologyVersion>>() { @Override public void apply(IgniteInternalFuture<AffinityTopologyVersion> fut) { try { - fut.get(); - // Remap. - map(keys.keySet(), F.t(node, keys), updTopVer); + map(keys.keySet(), F.t(node, keys), fut.get()); onDone(Collections.<K, V>emptyMap()); }
