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 2019/03/04 15:47:32 UTC
[ignite] branch master updated: IGNITE-8178
ZookeeperDiscoverySpiTest#testReconnectServersRestart* tests fail on TC
(#5755)
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 646e5f8 IGNITE-8178 ZookeeperDiscoverySpiTest#testReconnectServersRestart* tests fail on TC (#5755)
646e5f8 is described below
commit 646e5f8c6339b0d055ac7976e421d3c25a5f3b05
Author: Nikita Amelchev <ns...@gmail.com>
AuthorDate: Mon Mar 4 18:47:23 2019 +0300
IGNITE-8178 ZookeeperDiscoverySpiTest#testReconnectServersRestart* tests fail on TC (#5755)
* Fix NPE. Fix clear client reconnect event.
* Test with mvcc fix
* Clear debug
* Fix mvcc disconnected flag
* Fix disconnected flag(use reconnected event)
* Hard synchronizing
* Optimizing synchronization
* Fix NPE
* Cleanup debug.
---
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 7 +++++--
.../spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java | 6 +++---
.../spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java | 14 +++++++-------
.../internal/ZookeeperDiscoveryClientReconnectTest.java | 15 +++++++--------
.../zk/internal/ZookeeperDiscoverySpiTestBase.java | 4 ++--
5 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 57de875..3ebfc6e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -890,9 +890,12 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
exchLog.info("Finished exchange init [topVer=" + topVer + ", crd=" + crdNode + ']');
}
catch (IgniteInterruptedCheckedException e) {
- assert cctx.kernalContext().isStopping();
+ assert cctx.kernalContext().isStopping() || cctx.kernalContext().clientDisconnected();
- onDone(new IgniteCheckedException("Node stopped"));
+ if (cctx.kernalContext().clientDisconnected())
+ onDone(new IgniteCheckedException("Client disconnected"));
+ else
+ onDone(new IgniteCheckedException("Node stopped"));
throw e;
}
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 8d887f9..04f1586 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
@@ -569,7 +569,7 @@ public class ZookeeperDiscoveryImpl {
public boolean allNodesSupport(IgniteFeatures feature) {
checkState();
- return rtState.top.isAllNodes(n -> IgniteFeatures.nodeSupports(n, feature));
+ return rtState != null && rtState.top.isAllNodes(n -> IgniteFeatures.nodeSupports(n, feature));
}
/**
@@ -2022,7 +2022,7 @@ public class ZookeeperDiscoveryImpl {
}
/**
- * @param node Joining node data.
+ * @param joiningNodeData Joining node data.
* @return Validation result.
*/
private ZkNodeValidateResult validateJoiningNode(ZkJoiningNodeData joiningNodeData) {
@@ -4468,7 +4468,7 @@ public class ZookeeperDiscoveryImpl {
id = IgniteUuid.fromUuid(node.id());
endTime = System.currentTimeMillis() + node.sessionTimeout() + 1000;
- };
+ }
/** {@inheritDoc} */
@Override public IgniteUuid id() {
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java
index dd64e4e..f8a5f36 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java
@@ -19,17 +19,17 @@ package org.apache.ignite.spi.discovery.zk;
import org.apache.curator.test.ByteCodeRewrite;
import org.apache.ignite.spi.discovery.zk.internal.ZookeeperClientTest;
+import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryClientDisconnectTest;
import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryClientReconnectTest;
-import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoverySpiSaslFailedAuthTest;
-import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoverySpiSaslSuccessfulAuthTest;
+import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryCommunicationFailureTest;
+import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryConcurrentStartAndStartStopTest;
+import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryCustomEventsTest;
import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryMiscTest;
import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoverySegmentationAndConnectionRestoreTest;
-import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryConcurrentStartAndStartStopTest;
-import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryTopologyChangeAndReconnectTest;
-import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryCommunicationFailureTest;
-import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryClientDisconnectTest;
+import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoverySpiSaslFailedAuthTest;
+import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoverySpiSaslSuccessfulAuthTest;
import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoverySplitBrainTest;
-import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryCustomEventsTest;
+import org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryTopologyChangeAndReconnectTest;
import org.apache.zookeeper.jmx.MBeanRegistry;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.quorum.LearnerZooKeeperServer;
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryClientReconnectTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryClientReconnectTest.java
index 019511b..03daa01 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryClientReconnectTest.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryClientReconnectTest.java
@@ -17,19 +17,17 @@
package org.apache.ignite.spi.discovery.zk.internal;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.Ignite;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.util.lang.GridAbsPredicate;
import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.testframework.GridTestUtils;
-import org.junit.Ignore;
import org.junit.Test;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.atomic.AtomicInteger;
-
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
@@ -40,7 +38,6 @@ public class ZookeeperDiscoveryClientReconnectTest extends ZookeeperDiscoverySpi
/**
* @throws Exception If failed.
*/
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-8178")
@Test
public void testReconnectServersRestart_1() throws Exception {
reconnectServersRestart(1);
@@ -49,11 +46,11 @@ public class ZookeeperDiscoveryClientReconnectTest extends ZookeeperDiscoverySpi
/**
* @throws Exception If failed.
*/
- @Ignore("https://issues.apache.org/jira/browse/IGNITE-8178")
@Test
public void testReconnectServersRestart_2() throws Exception {
reconnectServersRestart(3);
}
+
/**
* @throws Exception If failed.
*/
@@ -141,6 +138,8 @@ public class ZookeeperDiscoveryClientReconnectTest extends ZookeeperDiscoverySpi
* @throws Exception If failed.
*/
private void reconnectServersRestart(int srvs) throws Exception {
+ sesTimeout = 30_000;
+
startGridsMultiThreaded(srvs);
helper.clientMode(true);
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTestBase.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTestBase.java
index 38147e1..08d8935 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTestBase.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTestBase.java
@@ -432,13 +432,13 @@ class ZookeeperDiscoverySpiTestBase extends GridCommonAbstractTest {
private UUID nodeId = currNodeId;
@Override public boolean apply(Event evt) {
- if(evt.type() == EVT_CLIENT_NODE_RECONNECTED){
+ if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) {
evts.remove(nodeId);
nodeId = evt.node().id();
}
- return false;
+ return true;
}
}, new int[] {EVT_CLIENT_NODE_RECONNECTED});
}