ignite-5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cf803519 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cf803519 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cf803519 Branch: refs/heads/ignite-5578 Commit: cf8035199ac8f8ec9dfcb1442c060de41e08ad5a Parents: 316dcc6 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 27 19:39:06 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 27 19:39:06 2017 +0300 ---------------------------------------------------------------------- .../cache/GridCachePartitionExchangeManager.java | 13 ------------- .../processors/cache/transactions/IgniteTxAdapter.java | 2 +- .../distributed/CacheLockReleaseNodeLeaveTest.java | 13 +++++++------ 3 files changed, 8 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cf803519/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index fc08630..7d6cc77 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -743,19 +743,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana } /** - * Gets topology version of last partition exchange, it is possible that last partition exchange - * is not completed yet. - * - * @return Topology version. - */ - public AffinityTopologyVersion topologyVersion() { - GridDhtPartitionsExchangeFuture lastInitializedFut0 = lastInitializedFut; - - return lastInitializedFut0 != null - ? lastInitializedFut0.exchangeId().topologyVersion() : AffinityTopologyVersion.NONE; - } - - /** * @return Topology version of latest completed partition exchange. */ public AffinityTopologyVersion readyAffinityVersion() { http://git-wip-us.apache.org/repos/asf/ignite/blob/cf803519/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index 91ce3ce..c734258 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -474,7 +474,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter implement return topVer; } - return cctx.exchange().topologyVersion(); + return cctx.exchange().readyAffinityVersion(); } return res; http://git-wip-us.apache.org/repos/asf/ignite/blob/cf803519/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java index 947754f..019e030 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLockReleaseNodeLeaveTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -249,10 +250,10 @@ public class CacheLockReleaseNodeLeaveTest extends GridCommonAbstractTest { // Wait when affinity change exchange start. boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - AffinityTopologyVersion topVer0 = - ((IgniteKernal)ignite0).context().cache().context().exchange().topologyVersion(); + GridDhtTopologyFuture topFut = + ((IgniteKernal)ignite0).context().cache().context().exchange().lastTopologyFuture(); - return topVer.compareTo(topVer0) < 0; + return topFut != null && topVer.compareTo(topFut.initialVersion()) < 0; } }, 10_000); @@ -330,10 +331,10 @@ public class CacheLockReleaseNodeLeaveTest extends GridCommonAbstractTest { // Wait when affinity change exchange start. boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - AffinityTopologyVersion topVer0 = - ((IgniteKernal)ignite0).context().cache().context().exchange().topologyVersion(); + GridDhtTopologyFuture topFut = + ((IgniteKernal)ignite0).context().cache().context().exchange().lastTopologyFuture(); - return topVer.compareTo(topVer0) < 0; + return topFut != null && topVer.compareTo(topFut.initialVersion()) < 0; } }, 10_000);
