You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/07/23 13:20:26 UTC
ignite git commit: IGNITE-8131 Fix for
ZookeeperDiscoverySpiTest#testClientReconnectSessionExpire* tests fail on TC
- Fixes #4166.
Repository: ignite
Updated Branches:
refs/heads/master 5794eb016 -> d7ba53761
IGNITE-8131 Fix for ZookeeperDiscoverySpiTest#testClientReconnectSessionExpire* tests fail on TC - Fixes #4166.
Signed-off-by: Dmitriy Pavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d7ba5376
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d7ba5376
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d7ba5376
Branch: refs/heads/master
Commit: d7ba53761137d8e044342394ac145d8deefcb9a5
Parents: 5794eb0
Author: Garus Denis <ga...@gmail.com>
Authored: Mon Jul 23 16:20:11 2018 +0300
Committer: Dmitriy Pavlov <dp...@apache.org>
Committed: Mon Jul 23 16:20:11 2018 +0300
----------------------------------------------------------------------
.../zk/internal/ZookeeperDiscoveryImpl.java | 6 ++--
.../zk/internal/ZookeeperDiscoverySpiTest.java | 29 ++++++++++++--------
2 files changed, 20 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d7ba5376/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 0a6df70..8b17622 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
@@ -2611,9 +2611,6 @@ public class ZookeeperDiscoveryImpl {
processNewEvents(newEvts);
- if (rtState.joined)
- rtState.evtsData = newEvts;
-
return newEvts;
}
@@ -2744,6 +2741,9 @@ public class ZookeeperDiscoveryImpl {
throw e;
}
+ if (rtState.joined)
+ rtState.evtsData = evtsData;
+
if (rtState.crd)
handleProcessedEvents("procEvt");
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/d7ba5376/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
index 0ef0000..4ccafc3 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
@@ -2318,8 +2318,6 @@ public class ZookeeperDiscoverySpiTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testClientReconnectSessionExpire1_1() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-8131");
-
clientReconnectSessionExpire(false);
}
@@ -2327,8 +2325,6 @@ public class ZookeeperDiscoverySpiTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testClientReconnectSessionExpire1_2() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-8131");
-
clientReconnectSessionExpire(true);
}
@@ -4671,16 +4667,25 @@ public class ZookeeperDiscoverySpiTest extends GridCommonAbstractTest {
ZooKeeper zk = zkClient(spi);
- ZooKeeper dummyZk = new ZooKeeper(
- spi.getZkConnectionString(),
- 10_000,
- null,
- zk.getSessionId(),
- zk.getSessionPasswd());
+ for (String s : spi.getZkConnectionString().split(",")) {
+ try {
+ ZooKeeper dummyZk = new ZooKeeper(
+ s,
+ 10_000,
+ null,
+ zk.getSessionId(),
+ zk.getSessionPasswd());
- dummyZk.exists("/a", false);
+ dummyZk.exists("/a", false);
- dummyClients.add(dummyZk);
+ dummyClients.add(dummyZk);
+
+ break;
+ }
+ catch (Exception e) {
+ log.warning("Can't connect to server " + s + " [err=" + e + ']');
+ }
+ }
}
for (ZooKeeper zk : dummyClients)