Fixed affinityReadyFuture to use actual for result.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/db69e902 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/db69e902 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/db69e902 Branch: refs/heads/ignite-3478 Commit: db69e90279d05ea980cf33ab4230c2c9d4dd2c01 Parents: b21f750 Author: sboikov <[email protected]> Authored: Tue Oct 3 16:42:01 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Oct 3 16:42:01 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/affinity/GridAffinityAssignmentCache.java | 2 +- .../ignite/internal/processors/cache/GridCacheAffinityManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db69e902/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java index f921251..cbc4eae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java @@ -392,7 +392,7 @@ public class GridAffinityAssignmentCache { log.debug("Completing topology ready future right away [head=" + aff.topologyVersion() + ", topVer=" + topVer + ']'); - fut.onDone(topVer); + fut.onDone(aff.topologyVersion()); } else if (stopErr != null) fut.onDone(stopErr); http://git-wip-us.apache.org/repos/asf/ignite/blob/db69e902/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java index 702b848..fbe1a95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java @@ -99,7 +99,7 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter { IgniteInternalFuture<AffinityTopologyVersion> fut = aff.readyFuture(topVer); - return fut != null ? fut : new GridFinishedFuture<>(topVer); + return fut != null ? fut : cctx.shared().exchange().lastFinishedFuture(); } /**
