You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dg...@apache.org on 2018/09/11 08:41:14 UTC
ignite git commit: IGNITE-8650 Fix flaky ZookeeperDiscovery
testClientReconnect. - Fixes #4704.
Repository: ignite
Updated Branches:
refs/heads/master 53f59f5d4 -> 3b383d155
IGNITE-8650 Fix flaky ZookeeperDiscovery testClientReconnect. - Fixes #4704.
Signed-off-by: Dmitriy Govorukhin <dm...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3b383d15
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3b383d15
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3b383d15
Branch: refs/heads/master
Commit: 3b383d155e70af56556c05a9fa6641c7f18950d3
Parents: 53f59f5
Author: Alexey Platonov <ap...@gmail.com>
Authored: Tue Sep 11 11:39:54 2018 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Tue Sep 11 11:39:54 2018 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteClientReconnectCacheTest.java | 2 +-
.../ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3b383d15/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 a975101..4df9b26 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
@@ -1203,7 +1203,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
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);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3b383d15/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index 069b3e2..2427c77 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -1334,7 +1334,9 @@ public class ZookeeperDiscoveryImpl {
}
}
- 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();