GridCacheNearReadersSelfTest.testTwoNodesTwoKeysNoBackups fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a1919d15 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a1919d15 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a1919d15 Branch: refs/heads/ignite-3477-master Commit: a1919d154d0c7c23022b528afbbc525790964bf1 Parents: a7afb7f Author: Konstantin Dudkov <[email protected]> Authored: Mon Apr 10 17:02:55 2017 +0300 Committer: Konstantin Dudkov <[email protected]> Committed: Mon Apr 10 17:02:55 2017 +0300 ---------------------------------------------------------------------- .../cache/distributed/near/GridCacheNearReadersSelfTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a1919d15/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java index faf9ba2..07a406b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java @@ -37,6 +37,7 @@ 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.GridCacheContext; +import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException; import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.cache.distributed.GridCacheModuloAffinityFunction; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry; @@ -219,6 +220,9 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { try { return !e1f.readers().contains(n2.id()); } + catch (GridCacheEntryRemovedException ignored) { + return true; + } catch (Exception e) { throw new RuntimeException(e); } @@ -226,7 +230,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { }, 5000); // Node 1 still has node2 in readers map. - assertFalse(e1.readers().contains(n2.id())); + assertFalse(((GridDhtCacheEntry)dht(cache1).entryEx(1)).readers().contains(n2.id())); } /** @throws Exception If failed. */
