Repository: ignite Updated Branches: refs/heads/master 308411678 -> f7c4e085c
IGNITE-9531 fix flaky ZookeeperDiscovery.testClientReconnect test - Fixes #4722. Signed-off-by: Dmitriy Govorukhin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f7c4e085 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f7c4e085 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f7c4e085 Branch: refs/heads/master Commit: f7c4e085c240de9117b8b363823643897b3c16dd Parents: 3084116 Author: Alexey Platonov <[email protected]> Authored: Wed Sep 12 15:29:57 2018 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Wed Sep 12 15:29:57 2018 +0300 ---------------------------------------------------------------------- .../IgniteClientReconnectCacheTest.java | 25 ++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f7c4e085/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java index 4df9b26..bc498da 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java @@ -37,7 +37,6 @@ import org.apache.ignite.IgniteClientDisconnectedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteTransactions; -import org.apache.ignite.Ignition; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cluster.ClusterGroup; @@ -105,6 +104,9 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac private static final int CACHE_PUTS_CNT = 3; /** */ + public static final String NEAR_CACHE_NAME = "nearCache"; + + /** */ private UUID nodeId; /** {@inheritDoc} */ @@ -177,7 +179,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac CacheConfiguration<Object, Object> ccfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME); ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setName("nearCache"); + ccfg.setName(NEAR_CACHE_NAME); final IgniteCache<Object, Object> nearCache = client.getOrCreateCache(ccfg, new NearCacheConfiguration<>()) .withAllowAtomicOpsInTx(); @@ -270,7 +272,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac checkCacheDiscoveryData(srv, client, DEFAULT_CACHE_NAME, true, true, false); - checkCacheDiscoveryData(srv, client, "nearCache", true, true, true); + checkCacheDiscoveryData(srv, client, NEAR_CACHE_NAME, true, true, true); checkCacheDiscoveryData(srv, client, STATIC_CACHE, true, true, false); @@ -308,7 +310,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac checkCacheDiscoveryData(srv2, client, DEFAULT_CACHE_NAME, true, true, false); - checkCacheDiscoveryData(srv2, client, "nearCache", true, true, true); + checkCacheDiscoveryData(srv2, client, NEAR_CACHE_NAME, true, true, true); checkCacheDiscoveryData(srv2, client, STATIC_CACHE, true, true, false); @@ -316,9 +318,18 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac assertEquals(20, staticCache.get(20)); - srv.cache(nearCache.getName()).put(20, 22); - - assertEquals(22, nearCache.localPeek(20)); + for(int i = 0; i < 100; i++) { + srv.cache(nearCache.getName()).put(i, 22); + Object actual = nearCache.localPeek(i); + // Change of topology may start partitions moving. It leads to invalidate near cache and + // null-values can be valid in such case. + if(actual == null) { + actual = nearCache.get(i); + assertEquals(22, actual); + actual = nearCache.localPeek(i); + } + assertEquals(22, actual); + } } /**
