Repository: ignite Updated Branches: refs/heads/ignite-zk 74330bc14 -> c625f7b10
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c625f7b1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c625f7b1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c625f7b1 Branch: refs/heads/ignite-zk Commit: c625f7b10c60f50792c2453ddc139febb3da2b59 Parents: 74330bc Author: sboikov <[email protected]> Authored: Mon Dec 4 12:01:30 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Dec 4 13:01:50 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../processors/cluster/ClusterProcessor.java | 3 +- .../continuous/ContinuousRoutineInfo.java | 13 +++++- .../continuous/ContinuousRoutinesInfo.java | 22 +++++++++ .../continuous/GridContinuousProcessor.java | 20 +++++++-- .../discovery/zk/internal/ZookeeperClient.java | 3 -- .../zk/internal/ZookeeperDiscoveryImpl.java | 47 ++++++++++++++------ .../IgniteClientReconnectAtomicsTest.java | 34 +++++++------- .../IgniteClientReconnectCollectionsTest.java | 18 +++++--- .../IgniteClientReconnectComputeTest.java | 4 +- ...eClientReconnectContinuousProcessorTest.java | 13 +++--- ...niteClientReconnectFailoverAbstractTest.java | 5 ++- .../IgniteClientReconnectServicesTest.java | 8 ++-- .../IgniteClientReconnectStreamerTest.java | 4 +- .../ignite/internal/IgniteClientRejoinTest.java | 4 ++ .../ZookeeperDiscoverySpiBasicTest.java | 2 +- 16 files changed, 139 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/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 ed910af..0202b1b 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 @@ -196,7 +196,7 @@ public class IgnitionEx { } - specs.add(new InstanceSpec(file, -1, -1, -1, true, -1, -1, -1)); + specs.add(new InstanceSpec(file, -1, -1, -1, true, -1, -1, 500)); } return new TestingCluster(specs); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java index 36c4c0f..6c38504 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java @@ -56,6 +56,7 @@ import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.future.IgniteFinishedFutureImpl; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.CI1; +import org.apache.ignite.internal.util.typedef.internal.LT; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteClosure; @@ -509,7 +510,7 @@ public class ClusterProcessor extends GridProcessorAdapter { log.debug("Failed to send metrics update to oldest, node failed: " + e); } catch (IgniteCheckedException e) { - U.warn(log, "Failed to send metrics update to oldest: " + e, e); + LT.warn(log, e, "Failed to send metrics update to oldest: " + e, false, false); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineInfo.java index fb56505..938c592 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutineInfo.java @@ -28,7 +28,7 @@ class ContinuousRoutineInfo implements Serializable { private static final long serialVersionUID = 0L; /** */ - final UUID srcNodeId; + UUID srcNodeId; /** */ final UUID routineId; @@ -48,6 +48,9 @@ class ContinuousRoutineInfo implements Serializable { /** */ final boolean autoUnsubscribe; + /** */ + transient boolean disconnected; + /** * @param hnd * @param nodeFilter @@ -72,4 +75,12 @@ class ContinuousRoutineInfo implements Serializable { this.interval = interval; this.autoUnsubscribe = autoUnsubscribe; } + + void sourceNodeId(UUID srcNodeId) { + this.srcNodeId = srcNodeId; + } + + void onDisconnected() { + disconnected = true; + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutinesInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutinesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutinesInfo.java index 8977b15..e46887b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutinesInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/ContinuousRoutinesInfo.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.continuous; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -46,6 +47,11 @@ class ContinuousRoutinesInfo { * @param dataBag Discovery data bag. */ void collectJoiningNodeData(DiscoveryDataBag dataBag) { + for (ContinuousRoutineInfo info : startedRoutines.values()) { + if (info.disconnected) + info.sourceNodeId(dataBag.joiningNodeId()); + } + dataBag.addJoiningNodeData(CONTINUOUS_PROC.ordinal(), new ContinuousRoutinesJoiningNodeDiscoveryData(new ArrayList<>(startedRoutines.values()))); } @@ -73,6 +79,22 @@ class ContinuousRoutinesInfo { } /** + * @param locRoutines Routines IDs which can survive reconnect. + */ + void onClientDisconnected(Collection<UUID> locRoutines) { + for (Iterator<Map.Entry<UUID, ContinuousRoutineInfo>> it = startedRoutines.entrySet().iterator(); it.hasNext();) { + Map.Entry<UUID, ContinuousRoutineInfo> e = it.next(); + + ContinuousRoutineInfo info = e.getValue(); + + if (!locRoutines.contains(info.routineId)) + it.remove(); + else + info.onDisconnected(); + } + } + + /** * Removes all routines with autoUnsubscribe=false started by given node. * * @param nodeId Node ID. http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index e888b37..5da8f3f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -986,11 +986,23 @@ public class GridContinuousProcessor extends GridProcessorAdapter { } if (doStop) { + boolean stop = false; + // Unregister routine locally. LocalRoutineInfo routine = locInfos.remove(routineId); + if (routine != null) { + stop = true; + + // Unregister handler locally. + unregisterHandler(routineId, routine.hnd, true); + } + + if (!stop && discoProtoVer == 2) + stop = routinesInfo.routineExists(routineId); + // Finish if routine is not found (wrong ID is provided). - if (routine == null) { + if (!stop) { stopFuts.remove(routineId); fut.onDone(); @@ -998,9 +1010,6 @@ public class GridContinuousProcessor extends GridProcessorAdapter { return fut; } - // Unregister handler locally. - unregisterHandler(routineId, routine.hnd, true); - try { ctx.discovery().sendCustomEvent(new StopRoutineDiscoveryMessage(routineId)); } @@ -1145,6 +1154,9 @@ public class GridContinuousProcessor extends GridProcessorAdapter { clientInfos.clear(); + if (discoProtoVer == 2) + routinesInfo.onClientDisconnected(locInfos.keySet()); + if (log.isDebugEnabled()) { log.debug("after onDisconnected [rmtInfos=" + rmtInfos + ", locInfos=" + locInfos + http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java index fa5b807..229e5c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java @@ -612,9 +612,6 @@ public class ZookeeperClient implements Watcher { U.warn(log, "Failed to execute zookeeper operation [err=" + e + ", state=" + state + ']'); - if (zk.getState() == ZooKeeper.States.CLOSED) - throw new ZookeeperClientFailedException(e); - if (state == ConnectionState.Lost) { U.error(log, "Operation failed with unexpected error, connection lost: " + e, e); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/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 44b5ae2..796310f 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 @@ -274,15 +274,13 @@ public class ZookeeperDiscoveryImpl { ", prevId=" + locNode.id() + ", locNode=" + locNode + ']'); - doReconnect(newId); + new ReconnectorThread(newId).start(); } /** * @param newId New ID. */ private void doReconnect(UUID newId) { - locNode.onClientDisconnected(newId); - if (state.joined) { assert state.evtsData != null; @@ -295,6 +293,8 @@ public class ZookeeperDiscoveryImpl { } try { + locNode.onClientDisconnected(newId); + joinTopology0(state.joined); } catch (Exception e) { @@ -386,6 +386,9 @@ public class ZookeeperDiscoveryImpl { return false; } catch (ZookeeperClientFailedException e) { + if (clientReconnectEnabled) + throw new IgniteClientDisconnectedException(null, "Client is disconnected."); + throw new IgniteException(e); } catch (InterruptedException e) { @@ -426,6 +429,9 @@ public class ZookeeperDiscoveryImpl { CreateMode.PERSISTENT_SEQUENTIAL); } catch (ZookeeperClientFailedException e) { + if (clientReconnectEnabled) + throw new IgniteClientDisconnectedException(null, "Client is disconnected."); + throw new IgniteException(e); } catch (InterruptedException e) { @@ -1469,8 +1475,16 @@ public class ZookeeperDiscoveryImpl { } } - if (reconnect) - new ReconnectorThread().start(); + if (reconnect) { + UUID newId = UUID.randomUUID(); + + U.quietAndWarn(log, "Received EVT_NODE_FAILED for local node, will try to reconnect with new id [" + + "newId=" + newId + + ", prevId=" + locNode.id() + + ", locNode=" + locNode + ']'); + + new ReconnectorThread(newId).start(); + } } else notifySegmented(); @@ -1775,11 +1789,16 @@ public class ZookeeperDiscoveryImpl { * */ private class ReconnectorThread extends IgniteSpiThread { + /** */ + private final UUID newId; + /** * */ - ReconnectorThread() { + ReconnectorThread(UUID newId) { super(ZookeeperDiscoveryImpl.this.igniteInstanceName, "zk-reconnector", log); + + this.newId = newId; } @Override protected void body() throws InterruptedException { @@ -1787,13 +1806,6 @@ public class ZookeeperDiscoveryImpl { busyLock.unblock(); - UUID newId = UUID.randomUUID(); - - U.quietAndWarn(log, "Connection to Zookeeper server is lost, local node will try to reconnect with new id [" + - "newId=" + newId + - ", prevId=" + locNode.id() + - ", locNode=" + locNode + ']'); - doReconnect(newId); } } @@ -1815,7 +1827,14 @@ public class ZookeeperDiscoveryImpl { return; } - new ReconnectorThread().start(); + UUID newId = UUID.randomUUID(); + + U.quietAndWarn(log, "Connection to Zookeeper server is lost, local node will try to reconnect with new id [" + + "newId=" + newId + + ", prevId=" + locNode.id() + + ", locNode=" + locNode + ']'); + + new ReconnectorThread(newId).start(); } else { U.warn(log, "Connection to Zookeeper server is lost, local node SEGMENTED."); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java index 00daf5f..e09902d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAtomicsTest.java @@ -52,6 +52,10 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr * @throws Exception If failed. */ public void testAtomicsReconnectClusterRestart() throws Exception { + // TODO ZK + if (!tcpDiscovery()) + return; + Ignite client = grid(serverCount()); assertTrue(client.cluster().localNode().isClient()); @@ -111,7 +115,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); IgniteAtomicSequence clientAtomicSeq = client.atomicSequence("atomicSeq", 0, true); @@ -144,7 +148,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final IgniteAtomicSequence clientAtomicSeq = client.atomicSequence("atomicSeqRmv", 0, true); @@ -192,7 +196,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); BlockTcpCommunicationSpi commSpi = commSpi(srv); @@ -253,7 +257,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); IgniteAtomicReference<String> clientAtomicRef = client.atomicReference("atomicRef", "1st value", true); @@ -294,7 +298,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final IgniteAtomicReference<String> clientAtomicRef = client.atomicReference("atomicRefRemoved", "1st value", true); @@ -347,7 +351,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final IgniteAtomicReference<String> clientAtomicRef = client.atomicReference("atomicRefInProg", "1st value", true); @@ -414,7 +418,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); IgniteAtomicStamped clientAtomicStamped = client.atomicStamped("atomicStamped", 0, 0, true); @@ -455,7 +459,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final IgniteAtomicStamped clientAtomicStamped = client.atomicStamped("atomicStampedRemoved", 0, 0, true); @@ -506,7 +510,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final IgniteAtomicStamped clientAtomicStamped = client.atomicStamped("atomicStampedInProgress", 0, 0, true); @@ -574,7 +578,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); IgniteAtomicLong clientAtomicLong = client.atomicLong("atomicLong", 0, true); @@ -605,7 +609,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final IgniteAtomicLong clientAtomicLong = client.atomicLong("atomicLongRmv", 0, true); @@ -646,7 +650,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); BlockTcpCommunicationSpi commSpi = commSpi(srv); @@ -701,7 +705,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); IgniteCountDownLatch clientLatch = client.countDownLatch("latch1", 3, false, true); @@ -742,7 +746,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); IgniteSemaphore clientSemaphore = client.semaphore("semaphore1", 3, false, true); @@ -789,7 +793,7 @@ public class IgniteClientReconnectAtomicsTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); IgniteLock clientLock = client.reentrantLock("lock1", true, fair, true); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java index 3f0e33d..a353689 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCollectionsTest.java @@ -66,6 +66,10 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA * @throws Exception If failed. */ public void testCollectionsReconnectClusterRestart() throws Exception { + // TODO ZK + if (!tcpDiscovery()) + return; + Ignite client = grid(serverCount()); assertTrue(client.cluster().localNode().isClient()); @@ -180,7 +184,7 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA private void serverNodeReconnect(CollectionConfiguration colCfg) throws Exception { final Ignite client = grid(serverCount()); - final Ignite srv = clientRouter(client); + final Ignite srv = ignite(0); assertNotNull(srv.queue("q", 0, colCfg)); assertNotNull(srv.set("s", colCfg)); @@ -201,7 +205,7 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final String setName = "set-" + colCfg.getAtomicityMode(); @@ -235,7 +239,7 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA assertTrue(client.cluster().localNode().isClient()); - final Ignite srv = clientRouter(client); + final Ignite srv = ignite(0); final String setName = "set-rm-" + colCfg.getAtomicityMode(); @@ -281,7 +285,7 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA assertTrue(client.cluster().localNode().isClient()); - final Ignite srv = clientRouter(client); + final Ignite srv = ignite(0); final String setName = "set-in-progress-" + colCfg.getAtomicityMode(); @@ -347,7 +351,7 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final String setName = "queue-" + colCfg.getAtomicityMode(); @@ -379,7 +383,7 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final String setName = "queue-rmv" + colCfg.getAtomicityMode(); @@ -423,7 +427,7 @@ public class IgniteClientReconnectCollectionsTest extends IgniteClientReconnectA assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final String setName = "queue-rmv" + colCfg.getAtomicityMode(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java index 7d34e29..57d3188 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectComputeTest.java @@ -103,7 +103,7 @@ public class IgniteClientReconnectComputeTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); BlockTcpCommunicationSpi commSpi = commSpi(srv); @@ -152,7 +152,7 @@ public class IgniteClientReconnectComputeTest extends IgniteClientReconnectAbstr assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); BlockTcpCommunicationSpi commSpi = commSpi(srv); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java index ca0d889..d68fc1c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectContinuousProcessorTest.java @@ -28,6 +28,7 @@ import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.events.Event; import org.apache.ignite.events.EventType; +import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.util.typedef.P2; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteRunnable; @@ -61,9 +62,9 @@ public class IgniteClientReconnectContinuousProcessorTest extends IgniteClientRe assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); - TestTcpDiscoverySpi srvSpi = spi(srv); + IgniteDiscoverySpi srvSpi = spi0(srv); EventListener lsnr = new EventListener(); @@ -133,9 +134,9 @@ public class IgniteClientReconnectContinuousProcessorTest extends IgniteClientRe assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); - TestTcpDiscoverySpi srvSpi = spi(srv); + IgniteDiscoverySpi srvSpi = spi0(srv); final String topic = "testTopic"; @@ -309,9 +310,9 @@ public class IgniteClientReconnectContinuousProcessorTest extends IgniteClientRe CacheEventListener lsnr) throws Exception { - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); - TestTcpDiscoverySpi srvSpi = spi(srv); + IgniteDiscoverySpi srvSpi = spi0(srv); final CountDownLatch reconnectLatch = new CountDownLatch(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java index 3e98051..676a641 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteClientDisconnectedException; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.Event; +import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -87,9 +88,9 @@ public abstract class IgniteClientReconnectFailoverAbstractTest extends IgniteCl assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); - TestTcpDiscoverySpi srvSpi = spi(srv); + IgniteDiscoverySpi srvSpi = spi0(srv); final AtomicBoolean stop = new AtomicBoolean(false); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java index 3e961e5..1e6dd64 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectServicesTest.java @@ -65,7 +65,7 @@ public class IgniteClientReconnectServicesTest extends IgniteClientReconnectAbst assertEquals((Object)topVer, srvc.test()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); reconnectClientNode(client, srv, null); @@ -88,7 +88,7 @@ public class IgniteClientReconnectServicesTest extends IgniteClientReconnectAbst assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); IgniteServices clnServices = client.services(); @@ -132,7 +132,7 @@ public class IgniteClientReconnectServicesTest extends IgniteClientReconnectAbst final IgniteServices services = client.services(); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); BlockTcpCommunicationSpi commSpi = commSpi(srv); @@ -179,7 +179,7 @@ public class IgniteClientReconnectServicesTest extends IgniteClientReconnectAbst final IgniteServices services = client.services(); - final Ignite srv = clientRouter(client); + final Ignite srv = ignite(0); services.deployClusterSingleton("testReconnectInProgress", new TestServiceImpl()); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java index 3959feb..36b9890 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStreamerTest.java @@ -71,7 +71,7 @@ public class IgniteClientReconnectStreamerTest extends IgniteClientReconnectAbst assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final IgniteCache<Object, Object> srvCache = srv.cache(CACHE_NAME); @@ -135,7 +135,7 @@ public class IgniteClientReconnectStreamerTest extends IgniteClientReconnectAbst assertTrue(client.cluster().localNode().isClient()); - Ignite srv = clientRouter(client); + Ignite srv = ignite(0); final IgniteCache<Object, Object> srvCache = srv.cache(CACHE_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java index a5d42e9..7fad8ad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientRejoinTest.java @@ -252,6 +252,10 @@ public class IgniteClientRejoinTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testClientsReconnectDisabled() throws Exception { + // TODO ZK + if (!tcpDiscovery()) + return; + clientReconnectDisabled = true; Ignite srv1 = startGrid("server1"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c625f7b1/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java index 1d8ea48..8fd3b8a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java @@ -80,7 +80,7 @@ import static org.apache.ignite.spi.discovery.zk.internal.ZookeeperDiscoveryImpl import static org.apache.zookeeper.ZooKeeper.ZOOKEEPER_CLIENT_CNXN_SOCKET; /** - * + * TODO ZK: test with max client connections limit error. */ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { /** */
