You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/12/08 13:43:11 UTC
[8/9] ignite git commit: zk
zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e3f4c6df
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e3f4c6df
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e3f4c6df
Branch: refs/heads/ignite-zk-alpha
Commit: e3f4c6df92ace1a2d4b0040b2a6dd736ae05963e
Parents: 4d14eaf
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 8 15:46:36 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 8 16:32:18 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/IgnitionEx.java | 1 +
.../zk/internal/ZookeeperDiscoveryImpl.java | 4 ++--
.../ignite/internal/ClusterGroupHostsSelfTest.java | 3 +++
.../GridDiscoveryManagerAliveCacheSelfTest.java | 16 ++++++++++------
.../GridServiceProxyClientReconnectSelfTest.java | 8 ++++++--
.../testframework/junits/GridAbstractTest.java | 4 +++-
6 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e3f4c6df/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 0202b1b..62ebcd8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -2290,6 +2290,7 @@ public class IgnitionEx {
ZookeeperDiscoverySpi zkSpi = new ZookeeperDiscoverySpi();
+ zkSpi.setSessionTimeout(20_000);
zkSpi.setZkConnectionString(zkCluster.getConnectString());
myCfg.setDiscoverySpi(zkSpi);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e3f4c6df/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index 814406a..c41a14d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -2220,7 +2220,7 @@ public class ZookeeperDiscoveryImpl {
private <T> T unmarshalZip(byte[] bytes) throws IgniteCheckedException {
assert bytes != null && bytes.length > 0;
- return U.unmarshalZip(marsh, bytes, null);
+ return U.unmarshalZip(marsh, bytes, U.resolveClassLoader(spi.ignite().configuration()));
}
/**
@@ -2511,7 +2511,7 @@ public class ZookeeperDiscoveryImpl {
return;
try {
- assert rc == 0 : rc;
+ assert rc == 0 : KeeperException.Code.get(rc);
checkIsCoordinator(rc, children);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e3f4c6df/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java
index 2328c84..141f4af 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupHostsSelfTest.java
@@ -61,6 +61,9 @@ public class ClusterGroupHostsSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testForHosts() throws Exception {
+ if (!tcpDiscovery())
+ return;
+
Ignite ignite = grid();
assertEquals(1, ignite.cluster().forHost("h_1").nodes().size());
http://git-wip-us.apache.org/repos/asf/ignite/blob/e3f4c6df/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index a8afa8b..8fad640 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -178,16 +178,20 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
* Waits while topology on all nodes became equals to the expected size.
*
* @param nodesCnt Expected nodes count.
- * @throws InterruptedException If interrupted.
+ * @throws Exception If interrupted.
*/
@SuppressWarnings("BusyWait")
- private void awaitDiscovery(long nodesCnt) throws InterruptedException {
- for (Ignite g : alive) {
- ((TcpDiscoverySpi)g.configuration().getDiscoverySpi()).waitForClientMessagePrecessed();
+ private void awaitDiscovery(int nodesCnt) throws Exception {
+ if (tcpDiscovery()) {
+ for (Ignite g : alive) {
+ ((TcpDiscoverySpi)g.configuration().getDiscoverySpi()).waitForClientMessagePrecessed();
- while (g.cluster().nodes().size() != nodesCnt)
- Thread.sleep(10);
+ while (g.cluster().nodes().size() != nodesCnt)
+ Thread.sleep(10);
+ }
}
+ else
+ waitForTopology(nodesCnt);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/e3f4c6df/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java
index d2fda2f..eb3bc5b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java
@@ -78,9 +78,13 @@ public class GridServiceProxyClientReconnectSelfTest extends GridCommonAbstractT
}
}, EventType.EVT_CLIENT_NODE_RECONNECTED);
- stopGrid("server");
+ if (tcpDiscovery()) {
+ stopGrid("server");
- startGrid("server");
+ startGrid("server");
+ }
+ else
+ reconnectClient(log, client);
assert latch.await(10, TimeUnit.SECONDS);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e3f4c6df/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 4aab533..8afbdb7 100755
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1090,7 +1090,9 @@ public abstract class GridAbstractTest extends TestCase {
for (Ignite g : srvs)
stopGrid(g.name(), cancel, false);
- assert G.allGrids().isEmpty();
+ List<Ignite> nodes = G.allGrids();
+
+ assert nodes.isEmpty() : nodes;
}
finally {
IgniteProcessProxy.killAll(); // In multi-JVM case.