IGNITE-8650 Fix flaky ZookeeperDiscovery testClientReconnect. - Fixes a…

…pache#4704. Signed-off-by: Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
percipiomedia · Sep 12, 2018 · b49b8b9 · b49b8b9
1 parent 19db096
commit b49b8b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
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
@@ -1203,7 +1203,7 @@ private void reconnectMultinode(boolean longHist) throws Exception {
 
                 ClusterGroup grp = client.cluster().forCacheNodes(DEFAULT_CACHE_NAME);
 
-                assertEquals(CLIENTS + srvNodes, grp.nodes().size());
+                assertEquals(expNodes, grp.nodes().size());
 
                 grp = client.cluster().forClientNodes(DEFAULT_CACHE_NAME);
 

diff --git a/...per/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/...per/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -1334,7 +1334,9 @@ private void checkClientsStatus(final List<String> aliveNodes) throws Exception
             }
         }
 
-        assert !aliveClients.isEmpty();
+        // This situation may appear while reconnection and this callback can be skipped.
+        if(!aliveClients.containsKey(locInternalOrder))
+            return;
 
         Map.Entry<Long, String> oldest = aliveClients.firstEntry();