http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/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..37292ff 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); @@ -209,14 +210,17 @@ public abstract class IgniteClientReconnectFailoverAbstractTest extends IgniteCl } if (err != null) { - log.error(err); + log.error("Test error: " + err); U.dumpThreads(log); CyclicBarrier barrier0 = barrier; - if (barrier0 != null) + if (barrier0 != null) { + barrier = null; + barrier0.reset(); + } stop.set(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/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/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java index e863cdf..b5c3ee8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectStopTest.java @@ -23,8 +23,10 @@ import org.apache.ignite.IgniteClientDisconnectedException; import org.apache.ignite.IgniteException; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.events.Event; +import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.spi.discovery.DiscoverySpi; import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED; import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED; @@ -50,15 +52,19 @@ public class IgniteClientReconnectStopTest extends IgniteClientReconnectAbstract Ignite srv = clientRouter(client); - TestTcpDiscoverySpi srvSpi = spi(srv); + DiscoverySpi srvSpi = spi0(srv); final CountDownLatch disconnectLatch = new CountDownLatch(1); final CountDownLatch reconnectLatch = new CountDownLatch(1); - final TestTcpDiscoverySpi clientSpi = spi(client); + final IgniteDiscoverySpi clientSpi = spi0(client); + + DiscoverySpiTestListener lsnr = new DiscoverySpiTestListener(); + + clientSpi.setInternalListener(lsnr); log.info("Block reconnect."); - clientSpi.writeLatch = new CountDownLatch(1); + lsnr.startBlockJoin(); client.events().localListen(new IgnitePredicate<Event>() { @Override public boolean apply(Event evt) { http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/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/a64b941d/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..8edbb52 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 @@ -256,6 +256,9 @@ public class IgniteClientRejoinTest extends GridCommonAbstractTest { Ignite srv1 = startGrid("server1"); + if (!tcpDiscovery()) + return; + crd = ((IgniteKernal)srv1).localNode(); Ignite srv2 = startGrid("server2"); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/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/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java index 1d70246..aa2abae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java @@ -91,12 +91,12 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb @Override protected void beforeTestsStarted() throws Exception { assert NODES_CNT >= 1; - withCache = false; + withCache = true; for (int i = 0; i < NODES_CNT; i++) startGrid(i); - withCache = true; + withCache = false; for (int i = NODES_CNT; i < 2 * NODES_CNT; i++) startGrid(i); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java index aefbc23..b8f9d70 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java @@ -27,9 +27,9 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.Event; import org.apache.ignite.events.EventType; +import org.apache.ignite.internal.managers.discovery.IgniteClusterNode; import org.apache.ignite.lang.IgniteClosure; import org.apache.ignite.lang.IgnitePredicate; -import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED; @@ -103,7 +103,7 @@ public class CacheMetricsForClusterGroupSelfTest extends GridCommonAbstractTest Collection<ClusterNode> nodes = grid(0).cluster().forRemotes().nodes(); for (ClusterNode node : nodes) { - Map<Integer, CacheMetrics> metrics = ((TcpDiscoveryNode)node).cacheMetrics(); + Map<Integer, CacheMetrics> metrics = ((IgniteClusterNode)node).cacheMetrics(); assertNotNull(metrics); assertFalse(metrics.isEmpty()); } @@ -118,6 +118,8 @@ public class CacheMetricsForClusterGroupSelfTest extends GridCommonAbstractTest /** * Test cluster group metrics in case of statistics disabled. + * + * @throws Exception If failed. */ public void testMetricsStatisticsDisabled() throws Exception { createCaches(false); @@ -134,7 +136,7 @@ public class CacheMetricsForClusterGroupSelfTest extends GridCommonAbstractTest Collection<ClusterNode> nodes = grid(0).cluster().forRemotes().nodes(); for (ClusterNode node : nodes) { - Map<Integer, CacheMetrics> metrics = ((TcpDiscoveryNode) node).cacheMetrics(); + Map<Integer, CacheMetrics> metrics = ((IgniteClusterNode)node).cacheMetrics(); assertNotNull(metrics); assertTrue(metrics.isEmpty()); } @@ -172,7 +174,9 @@ public class CacheMetricsForClusterGroupSelfTest extends GridCommonAbstractTest } /** - * Wait for {@link EventType#EVT_NODE_METRICS_UPDATED} event will be receieved. + * Wait for {@link EventType#EVT_NODE_METRICS_UPDATED} event will be received. + * + * @throws InterruptedException If interrupted. */ private void awaitMetricsUpdate() throws InterruptedException { final CountDownLatch latch = new CountDownLatch((GRID_CNT + 1) * 2); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index df93ae4..299dbf4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -115,6 +115,8 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { protected void initStoreStrategy() throws IgniteCheckedException { if (storeStgy == null) storeStgy = isMultiJvm() ? new H2CacheStoreStrategy() : new MapCacheStoreStrategy(); + else if (isMultiJvm() && !(storeStgy instanceof H2CacheStoreStrategy)) + storeStgy = new H2CacheStoreStrategy(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java index 0069110..c135f2d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java @@ -45,7 +45,9 @@ public class IgniteCacheNearLockValueSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - startGridsMultiThreaded(2); + startGrid(1); + + startGrid(0); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java index f321453..55ff31a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java @@ -67,6 +67,17 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends IgniteCacheAbstractTes } /** {@inheritDoc} */ + @Override protected void startGrids() throws Exception { + int cnt = gridCount(); + + assert cnt >= 1 : "At least one grid must be started"; + + startGridsMultiThreaded(1, cnt - 1); + + startGrid(0); + } + + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java index 2337329..838e56d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java @@ -38,6 +38,7 @@ import org.apache.ignite.internal.IgniteClientReconnectAbstractTest; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.TestRecordingCommunicationSpi; +import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage; @@ -1109,6 +1110,70 @@ public class IgniteClusterActivateDeactivateTest extends GridCommonAbstractTest } /** + * @throws Exception If failed. + */ + public void testActivateFailover3() throws Exception { + stateChangeFailover3(true); + } + + /** + * @throws Exception If failed. + */ + public void testDeactivateFailover3() throws Exception { + stateChangeFailover3(false); + } + + /** + * @param activate If {@code true} tests activation, otherwise deactivation. + * @throws Exception If failed. + */ + private void stateChangeFailover3(boolean activate) throws Exception { + testReconnectSpi = true; + + startNodesAndBlockStatusChange(4, 0, 0, !activate); + + client = false; + + IgniteInternalFuture startFut1 = GridTestUtils.runAsync(new Callable() { + @Override public Object call() throws Exception { + startGrid(4); + + return null; + } + }, "start-node1"); + + IgniteInternalFuture startFut2 = GridTestUtils.runAsync(new Callable() { + @Override public Object call() throws Exception { + startGrid(5); + + return null; + } + }, "start-node2"); + + U.sleep(1000); + + // Stop all nodes participating in state change and not allow last node to finish exchange. + for (int i = 0; i < 4; i++) + ((IgniteDiscoverySpi)ignite(i).configuration().getDiscoverySpi()).simulateNodeFailure(); + + for (int i = 0; i < 4; i++) + stopGrid(getTestIgniteInstanceName(i), true, false); + + startFut1.get(); + startFut2.get(); + + assertFalse(ignite(4).active()); + assertFalse(ignite(5).active()); + + ignite(4).active(true); + + for (int i = 0; i < 4; i++) + startGrid(i); + + checkCaches1(6); + } + + /** * @param exp If {@code true} there should be recorded messages. */ private void checkRecordedMessages(boolean exp) { http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java index 566860d..2f9bd53 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDaemonNodeMarshallerCacheTest.java @@ -79,7 +79,7 @@ public class IgniteDaemonNodeMarshallerCacheTest extends GridCommonAbstractTest * @param startFirst If {@code true} daemon node is started first. * @throws Exception If failed. */ - public void marshalOnDaemonNode(boolean startFirst) throws Exception { + private void marshalOnDaemonNode(boolean startFirst) throws Exception { int nodeIdx = 0; if (!startFirst) { @@ -92,6 +92,7 @@ public class IgniteDaemonNodeMarshallerCacheTest extends GridCommonAbstractTest Ignite daemonNode = startGrid(nodeIdx++); + assertTrue(daemonNode.cluster().localNode().isDaemon()); assertEquals("true", daemonNode.cluster().localNode().attribute(ATTR_DAEMON)); daemon = false; http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java index 3ee51c8..7e8c086 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataUpdatesFlowTest.java @@ -184,6 +184,7 @@ public class BinaryMetadataUpdatesFlowTest extends GridCommonAbstractTest { * Starts new ignite node and submits computation job to it. * @param idx Index. * @param stopFlag Stop flag. + * @throws Exception If failed. */ private void startComputation(int idx, AtomicBoolean stopFlag) throws Exception { clientMode = false; @@ -199,6 +200,7 @@ public class BinaryMetadataUpdatesFlowTest extends GridCommonAbstractTest { * @param idx Index. * @param deafClient Deaf client. * @param observedIds Observed ids. + * @throws Exception If failed. */ private void startListening(int idx, boolean deafClient, Set<Integer> observedIds) throws Exception { clientMode = true; @@ -269,7 +271,7 @@ public class BinaryMetadataUpdatesFlowTest extends GridCommonAbstractTest { } /** - * + * @throws Exception If failed. */ public void testFlowNoConflicts() throws Exception { startComputation(0, stopFlag0); @@ -311,11 +313,14 @@ public class BinaryMetadataUpdatesFlowTest extends GridCommonAbstractTest { } /** - * + * @throws Exception If failed. */ public void testFlowNoConflictsWithClients() throws Exception { startComputation(0, stopFlag0); + if (!tcpDiscovery()) + return; + startComputation(1, stopFlag1); startComputation(2, stopFlag2); @@ -617,6 +622,9 @@ public class BinaryMetadataUpdatesFlowTest extends GridCommonAbstractTest { while (!updatesQueue.isEmpty()) { BinaryUpdateDescription desc = updatesQueue.poll(); + if (desc == null) + break; + BinaryObjectBuilder builder = ignite.binary().builder(BINARY_TYPE_NAME); BinaryObject bo = newBinaryObject(builder, desc); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java index 313aaf9..81614cb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheClientNodeBinaryObjectMetadataMultinodeTest.java @@ -242,7 +242,7 @@ public class GridCacheClientNodeBinaryObjectMetadataMultinodeTest extends GridCo @Override public boolean apply() { Collection<BinaryType> metaCol = p0.types(); - return metaCol.size() == 1000; + return metaCol.size() >= 1000; } }, getTestTimeout()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java index ed54377..dac3ff6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueClientDisconnectTest.java @@ -32,6 +32,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +/** + * + */ public class GridCacheQueueClientDisconnectTest extends GridCommonAbstractTest { /** */ private static final String IGNITE_QUEUE_NAME = "ignite-queue-client-reconnect-test"; @@ -66,6 +69,10 @@ public class GridCacheQueueClientDisconnectTest extends GridCommonAbstractTest { return cfg; } + /** + * @param cacheAtomicityMode Atomicity mode. + * @return Configuration. + */ private static CollectionConfiguration collectionConfiguration(CacheAtomicityMode cacheAtomicityMode) { CollectionConfiguration colCfg = new CollectionConfiguration(); @@ -74,6 +81,9 @@ public class GridCacheQueueClientDisconnectTest extends GridCommonAbstractTest { return colCfg; } + /** + * @throws Exception If failed. + */ public void testClientDisconnect() throws Exception { try { Ignite server = startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java index 51764b5..d85201a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java @@ -494,7 +494,8 @@ public abstract class IgniteClientDataStructuresAbstractTest extends GridCommonA assertTrue(ignite.configuration().isClientMode()); - assertEquals(clientDiscovery(), ignite.configuration().getDiscoverySpi().isClientMode()); + if (tcpDiscovery()) + assertEquals(clientDiscovery(), ignite.configuration().getDiscoverySpi().isClientMode()); return ignite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java index 0704dbd..e456047 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java @@ -52,6 +52,7 @@ import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.internal.DiscoverySpiTestListener; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.cluster.NodeOrderComparator; import org.apache.ignite.internal.cluster.NodeOrderLegacyComparator; @@ -60,7 +61,7 @@ import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.IgniteNodeAttributes; import org.apache.ignite.internal.TestRecordingCommunicationSpi; import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException; -import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; +import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.affinity.GridAffinityFunctionContextImpl; import org.apache.ignite.internal.processors.cache.CacheAffinityChangeMessage; @@ -88,7 +89,6 @@ import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.services.Service; import org.apache.ignite.services.ServiceContext; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -158,7 +158,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { cfg.setCommunicationSpi(commSpi); - TestTcpDiscoverySpi discoSpi = new TestTcpDiscoverySpi(); + TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); discoSpi.setForceServerMode(forceSrvMode); discoSpi.setIpFinder(ipFinder); @@ -674,9 +674,11 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { checkAffinity(4, topVer(4, 0), true); - TestTcpDiscoverySpi discoSpi = (TestTcpDiscoverySpi)ignite0.configuration().getDiscoverySpi(); + DiscoverySpiTestListener lsnr = new DiscoverySpiTestListener(); - discoSpi.blockCustomEvent(); + ((IgniteDiscoverySpi)ignite0.configuration().getDiscoverySpi()).setInternalListener(lsnr); + + lsnr.blockCustomEvent(CacheAffinityChangeMessage.class); stopGrid(1); @@ -687,7 +689,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { for (IgniteInternalFuture<?> fut : futs) assertFalse(fut.isDone()); - discoSpi.stopBlock(); + lsnr.stopBlockCustomEvents(); checkAffinity(3, topVer(5, 0), false); @@ -1409,8 +1411,10 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { public void testDelayAssignmentAffinityChanged() throws Exception { Ignite ignite0 = startServer(0, 1); - TestTcpDiscoverySpi discoSpi0 = - (TestTcpDiscoverySpi)ignite0.configuration().getDiscoverySpi(); + DiscoverySpiTestListener lsnr = new DiscoverySpiTestListener(); + + ((IgniteDiscoverySpi)ignite0.configuration().getDiscoverySpi()).setInternalListener(lsnr); + TestRecordingCommunicationSpi commSpi0 = (TestRecordingCommunicationSpi)ignite0.configuration().getCommunicationSpi(); @@ -1418,19 +1422,19 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { checkAffinity(2, topVer(2, 0), true); - discoSpi0.blockCustomEvent(); + lsnr.blockCustomEvent(CacheAffinityChangeMessage.class); startServer(2, 3); checkAffinity(3, topVer(3, 0), false); - discoSpi0.waitCustomEvent(); + lsnr.waitCustomEvent(); blockSupplySend(commSpi0, CACHE_NAME1); startServer(3, 4); - discoSpi0.stopBlock(); + lsnr.stopBlockCustomEvents(); checkAffinity(4, topVer(4, 0), false); @@ -1452,8 +1456,10 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { try { Ignite ignite0 = startServer(0, 1); - TestTcpDiscoverySpi discoSpi0 = - (TestTcpDiscoverySpi)ignite0.configuration().getDiscoverySpi(); + DiscoverySpiTestListener lsnr = new DiscoverySpiTestListener(); + + ((IgniteDiscoverySpi)ignite0.configuration().getDiscoverySpi()).setInternalListener(lsnr); + TestRecordingCommunicationSpi commSpi0 = (TestRecordingCommunicationSpi)ignite0.configuration().getCommunicationSpi(); @@ -1465,11 +1471,11 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { checkAffinity(3, topVer(3, 1), false); - discoSpi0.blockCustomEvent(); + lsnr.blockCustomEvent(CacheAffinityChangeMessage.class); stopNode(2, 4); - discoSpi0.waitCustomEvent(); + lsnr.waitCustomEvent(); blockSupplySend(commSpi0, CACHE_NAME1); @@ -1483,7 +1489,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { Thread.sleep(2_000); - discoSpi0.stopBlock(); + lsnr.stopBlockCustomEvents(); boolean started = GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { @@ -1534,14 +1540,16 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { ignite0.createCache(ccfg); - TestTcpDiscoverySpi discoSpi0 = - (TestTcpDiscoverySpi)ignite0.configuration().getDiscoverySpi(); + DiscoverySpiTestListener lsnr = new DiscoverySpiTestListener(); + + ((IgniteDiscoverySpi)ignite0.configuration().getDiscoverySpi()).setInternalListener(lsnr); + TestRecordingCommunicationSpi spi = (TestRecordingCommunicationSpi)ignite0.configuration().getCommunicationSpi(); blockSupplySend(spi, CACHE_NAME2); - discoSpi0.blockCustomEvent(); + lsnr.blockCustomEvent(CacheAffinityChangeMessage.class); startServer(1, 2); @@ -1551,7 +1559,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { spi.stopBlock(); - discoSpi0.waitCustomEvent(); + lsnr.waitCustomEvent(); ignite0.destroyCache(CACHE_NAME2); @@ -1561,7 +1569,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { ignite0.createCache(ccfg); - discoSpi0.stopBlock(); + lsnr.stopBlockCustomEvents(); checkAffinity(3, topVer(3, 1), false); checkAffinity(3, topVer(3, 2), false); @@ -2967,83 +2975,6 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { /** * */ - static class TestTcpDiscoverySpi extends TcpDiscoverySpi { - /** */ - private boolean blockCustomEvt; - - /** */ - private final Object mux = new Object(); - - /** */ - private List<DiscoverySpiCustomMessage> blockedMsgs = new ArrayList<>(); - - /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { - synchronized (mux) { - if (blockCustomEvt) { - DiscoveryCustomMessage msg0 = GridTestUtils.getFieldValue(msg, "delegate"); - - if (msg0 instanceof CacheAffinityChangeMessage) { - log.info("Block custom message: " + msg0); - - blockedMsgs.add(msg); - - mux.notifyAll(); - - return; - } - } - } - - super.sendCustomEvent(msg); - } - - /** - * - */ - public void blockCustomEvent() { - synchronized (mux) { - assert blockedMsgs.isEmpty() : blockedMsgs; - - blockCustomEvt = true; - } - } - - /** - * @throws InterruptedException If interrupted. - */ - public void waitCustomEvent() throws InterruptedException { - synchronized (mux) { - while (blockedMsgs.isEmpty()) - mux.wait(); - } - } - - /** - * - */ - public void stopBlock() { - List<DiscoverySpiCustomMessage> msgs; - - synchronized (this) { - msgs = new ArrayList<>(blockedMsgs); - - blockCustomEvt = false; - - blockedMsgs.clear(); - } - - for (DiscoverySpiCustomMessage msg : msgs) { - log.info("Resend blocked message: " + msg); - - super.sendCustomEvent(msg); - } - } - } - - /** - * - */ static class TestEntryProcessor implements EntryProcessor<Object, Object, Object> { /** */ private Object val; http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index 3834df9..5dea5d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -45,6 +45,7 @@ import org.apache.ignite.transactions.TransactionIsolation; import static org.apache.ignite.IgniteState.STOPPED; import static org.apache.ignite.IgniteSystemProperties.IGNITE_TX_SALVAGE_TIMEOUT; import static org.apache.ignite.IgniteSystemProperties.getInteger; +import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC; import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; @@ -188,7 +189,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac return true; } - }, EVT_NODE_LEFT); + }, EVT_NODE_LEFT, EVT_NODE_FAILED); stopGrid(idx); @@ -268,7 +269,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac return true; } - }, EVT_NODE_LEFT); + }, EVT_NODE_LEFT, EVT_NODE_FAILED); stopGrid(idx); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java index e71d3ee..b7ae844 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java @@ -168,6 +168,8 @@ public class IgniteCache150ClientsTest extends GridCommonAbstractTest { log.info("Started all clients."); + waitForTopology(CLIENTS + 1); + checkNodes(CLIENTS + 1); } http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java index a0be40e..7785a3c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java @@ -178,7 +178,7 @@ public class IgniteCacheManyClientsTest extends GridCommonAbstractTest { log.info("All clients started."); try { - checkNodes(SRVS + CLIENTS); + checkNodes0(SRVS + CLIENTS); } finally { for (Ignite client : clients) @@ -188,6 +188,30 @@ public class IgniteCacheManyClientsTest extends GridCommonAbstractTest { /** * @param expCnt Expected number of nodes. + * @throws Exception If failed. + */ + private void checkNodes0(final int expCnt) throws Exception { + boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + try { + checkNodes(expCnt); + + return true; + } + catch (AssertionFailedError e) { + log.info("Check failed, will retry: " + e); + } + + return false; + } + }, 10_000); + + if (!wait) + checkNodes(expCnt); + } + + /** + * @param expCnt Expected number of nodes. */ private void checkNodes(int expCnt) { assertEquals(expCnt, G.allGrids().size()); @@ -297,23 +321,7 @@ public class IgniteCacheManyClientsTest extends GridCommonAbstractTest { if (err0 != null) throw err0; - boolean wait = GridTestUtils.waitForCondition(new GridAbsPredicate() { - @Override public boolean apply() { - try { - checkNodes(SRVS + THREADS); - - return true; - } - catch (AssertionFailedError e) { - log.info("Check failed, will retry: " + e); - } - - return false; - } - }, 10_000); - - if (!wait) - checkNodes(SRVS + THREADS); + checkNodes0(SRVS + THREADS); log.info("Stop clients."); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java index a55f21d..486fd60 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java @@ -713,6 +713,8 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest ", backups=" + ccfg.getBackups() + ", near=" + (ccfg.getNearConfiguration() != null) + "]"); + awaitPartitionMapExchange(); + int srvNum = serversNumber(); if (serversNumber() > 1) { ignite(serversNumber() + 1).createNearCache(ccfg.getName(), new NearCacheConfiguration<>()); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java index e3fa116..60f2f0a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java @@ -116,6 +116,8 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract @Nullable @Override public Object call() throws Exception { IgniteConfiguration cfg = loadConfiguration("modules/core/src/test/config/spring-multicache.xml"); + cfg.setGridLogger(getTestResources().getLogger()); + startGrid(Thread.currentThread().getName(), cfg); return null; @@ -161,6 +163,8 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = loadConfiguration("modules/core/src/test/config/spring-multicache.xml"); + cfg.setGridLogger(getTestResources().getLogger()); + cfg.setIgniteInstanceName(igniteInstanceName); for (CacheConfiguration cCfg : cfg.getCacheConfiguration()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java index 05a9759..83eff89 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java @@ -308,6 +308,8 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { // Check all left nodes. checkActiveState(ignites); + + awaitPartitionMapExchange(); // Need wait, otherwise test logic is broken if EVT_NODE_FAILED exchanges are merged. } info("Waiting for preload futures: " + F.view(futs, new IgnitePredicate<IgniteFuture<?>>() { http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/TxRecoveryStoreEnabledTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/TxRecoveryStoreEnabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/TxRecoveryStoreEnabledTest.java index 7b350c8..060af21 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/TxRecoveryStoreEnabledTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/TxRecoveryStoreEnabledTest.java @@ -34,11 +34,11 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteInterruptedCheckedException; +import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; @@ -65,7 +65,6 @@ public class TxRecoveryStoreEnabledTest extends GridCommonAbstractTest { IgniteConfiguration cfg = super.getConfiguration(gridName); cfg.setCommunicationSpi(new TestCommunicationSpi()); - cfg.setDiscoverySpi(new TestDiscoverySpi()); CacheConfiguration ccfg = defaultCacheConfiguration(); @@ -126,7 +125,7 @@ public class TxRecoveryStoreEnabledTest extends GridCommonAbstractTest { IgniteConfiguration cfg = node0.configuration(); ((TestCommunicationSpi)cfg.getCommunicationSpi()).block(); - ((TestDiscoverySpi)cfg.getDiscoverySpi()).simulateNodeFailure(); + ((IgniteDiscoverySpi)cfg.getDiscoverySpi()).simulateNodeFailure(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); @@ -201,16 +200,6 @@ public class TxRecoveryStoreEnabledTest extends GridCommonAbstractTest { /** * */ - private static class TestDiscoverySpi extends TcpDiscoverySpi { - /** {@inheritDoc} */ - @Override protected void simulateNodeFailure() { - super.simulateNodeFailure(); - } - } - - /** - * - */ private static class TestCommunicationSpi extends TcpCommunicationSpi { /** Block. */ private volatile boolean block; http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java index 3c57957..96fb8f6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java @@ -37,6 +37,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; +import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; /** @@ -125,7 +126,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom return true; } - }, EVT_NODE_LEFT)); + }, EVT_NODE_LEFT, EVT_NODE_FAILED)); } stopGrid(idx); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java index c8b3bb6..9b531c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.cache.query.continuous; +import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javax.cache.event.CacheEntryListenerException; @@ -28,6 +29,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.Event; import org.apache.ignite.events.EventType; import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.managers.communication.GridIoManager; import org.apache.ignite.internal.util.nio.GridNioServer; import org.apache.ignite.internal.util.typedef.internal.U; @@ -90,7 +92,7 @@ public class ClientReconnectContinuousQueryTest extends GridCommonAbstractTest { try { startGrids(2); - IgniteEx client = grid(CLIENT_IDX); + final IgniteEx client = grid(CLIENT_IDX); client.events().localListen(new DisconnectListener(), EventType.EVT_CLIENT_NODE_DISCONNECTED); @@ -112,11 +114,19 @@ public class ClientReconnectContinuousQueryTest extends GridCommonAbstractTest { skipRead(client, true); - putSomeKeys(1_000); + IgniteInternalFuture<?> fut = GridTestUtils.runAsync(new Callable<Void>() { + @Override public Void call() throws Exception { + assertTrue(disconLatch.await(10_000, TimeUnit.MILLISECONDS)); + + skipRead(client, false); - assertTrue(disconLatch.await(10_000, TimeUnit.MILLISECONDS)); + return null; + } + }); - skipRead(client, false); + putSomeKeys(1_000); + + fut.get(); assertTrue(reconLatch.await(10_000, TimeUnit.MILLISECONDS)); @@ -129,7 +139,6 @@ public class ClientReconnectContinuousQueryTest extends GridCommonAbstractTest { finally { stopAllGrids(); } - } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java index 92c1760..226302f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java @@ -104,7 +104,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC setExternalLoader = true; final Ignite ignite0 = startGrid(1); - executeContiniouseQuery(ignite0.cache("simple")); + executeContinuousQuery(ignite0.cache("simple")); log = new GridStringLogger(); clientMode = true; @@ -112,8 +112,10 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC startGrid(2); - assertTrue(log.toString().contains("Failed to unmarshal continuous query remote filter on client node. " + - "Can be ignored.")); + String logStr = log.toString(); + + assertTrue(logStr.contains("Failed to unmarshal continuous query remote filter on client node. " + + "Can be ignored.") || logStr.contains("Failed to unmarshal continuous routine handler")); } /** @@ -127,7 +129,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC clientMode = false; final Ignite ignite0 = startGrid(1); - executeContiniouseQuery(ignite0.cache("simple")); + executeContinuousQuery(ignite0.cache("simple")); log = new GridStringLogger(); clientMode = true; @@ -149,15 +151,18 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC setExternalLoader = true; final Ignite ignite0 = startGrid(1); - executeContiniouseQuery(ignite0.cache("simple")); + executeContinuousQuery(ignite0.cache("simple")); log = new GridStringLogger(); setExternalLoader = false; startGrid(2); - assertTrue(log.toString().contains("class org.apache.ignite.IgniteCheckedException: " + - "Failed to find class with given class loader for unmarshalling")); + String logStr = log.toString(); + + assertTrue(logStr.contains("class org.apache.ignite.IgniteCheckedException: " + + "Failed to find class with given class loader for unmarshalling") + || logStr.contains("Failed to unmarshal continuous routine handler")); } /** @@ -171,7 +176,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC setExternalLoader = true; final Ignite ignite0 = startGrid(1); - executeContiniouseQuery(ignite0.cache("simple")); + executeContinuousQuery(ignite0.cache("simple")); log = new GridStringLogger(); @@ -185,7 +190,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC * @param cache Ignite cache. * @throws Exception If fail. */ - private void executeContiniouseQuery(IgniteCache cache) throws Exception { + private void executeContinuousQuery(IgniteCache cache) throws Exception { ContinuousQuery<Integer, String> qry = new ContinuousQuery<>(); qry.setLocalListener( http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java index 9ad6d4e..906cc7d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java @@ -119,6 +119,9 @@ public class IgniteCacheContinuousQueryClientReconnectTest extends IgniteClientR * @throws Exception If failed. */ public void testReconnectClientAndLeftRouter() throws Exception { + if (!tcpDiscovery()) + return; + Ignite client = grid(serverCount()); final Ignite srv = clientRouter(client); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java index 61ceef7..16ea848 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/version/CacheVersionedEntryAbstractTest.java @@ -18,11 +18,12 @@ package org.apache.ignite.internal.processors.cache.version; import java.util.HashSet; +import java.util.Map; import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; import javax.cache.Cache; import javax.cache.processor.EntryProcessor; import javax.cache.processor.EntryProcessorException; +import javax.cache.processor.EntryProcessorResult; import javax.cache.processor.MutableEntry; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheEntry; @@ -56,23 +57,15 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS public void testInvoke() throws Exception { Cache<Integer, String> cache = grid(0).cache(DEFAULT_CACHE_NAME); - final AtomicInteger invoked = new AtomicInteger(); - - cache.invoke(100, new EntryProcessor<Integer, String, Object>() { - @Override public Object process(MutableEntry<Integer, String> entry, Object... arguments) - throws EntryProcessorException { - - invoked.incrementAndGet(); - + assertNotNull(cache.invoke(100, new EntryProcessor<Integer, String, Object>() { + @Override public Object process(MutableEntry<Integer, String> entry, Object... args) { CacheEntry<Integer, String> verEntry = entry.unwrap(CacheEntry.class); checkVersionedEntry(verEntry); - return entry; + return verEntry.version(); } - }); - - assert invoked.get() > 0; + })); } /** @@ -86,23 +79,17 @@ public abstract class CacheVersionedEntryAbstractTest extends GridCacheAbstractS for (int i = 0; i < ENTRIES_NUM; i++) keys.add(i); - final AtomicInteger invoked = new AtomicInteger(); - - cache.invokeAll(keys, new EntryProcessor<Integer, String, Object>() { - @Override public Object process(MutableEntry<Integer, String> entry, Object... arguments) - throws EntryProcessorException { - - invoked.incrementAndGet(); - + Map<Integer, EntryProcessorResult<Object>> res = cache.invokeAll(keys, new EntryProcessor<Integer, String, Object>() { + @Override public Object process(MutableEntry<Integer, String> entry, Object... args) { CacheEntry<Integer, String> verEntry = entry.unwrap(CacheEntry.class); checkVersionedEntry(verEntry); - return null; + return verEntry.version(); } }); - assert invoked.get() > 0; + assertEquals(ENTRIES_NUM, res.size()); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java index f07b1a3..1a7abd4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java @@ -447,7 +447,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(GRID_CNT, nodeIds.size()); assertEquals(GRID_CNT, cnt.get()); @@ -488,7 +488,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(GRID_CNT, nodeIds.size()); assertEquals(GRID_CNT, cnt.get()); @@ -532,7 +532,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(GRID_CNT, nodeIds.size()); assertEquals(GRID_CNT, cnt.get()); @@ -578,7 +578,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); grid(0).compute().withName("exclude").run(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(GRID_CNT, nodeIds.size()); assertEquals(GRID_CNT, cnt.get()); @@ -619,7 +619,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(GRID_CNT - 1, nodeIds.size()); assertEquals(GRID_CNT - 1, cnt.get()); @@ -660,7 +660,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(GRID_CNT - 1, nodeIds.size()); assertEquals(GRID_CNT - 1, cnt.get()); @@ -701,7 +701,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(1, nodeIds.size()); assertEquals(1, cnt.get()); @@ -744,7 +744,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(1, nodeIds.size()); assertEquals(1, cnt.get()); @@ -785,7 +785,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().run(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(1, nodeIds.size()); assertEquals(1, cnt.get()); @@ -828,7 +828,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { compute(grid(0).cluster().forLocal()).run(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(1, cnt.get()); @@ -878,7 +878,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(GRID_CNT + 1, nodeIds.size()); assertEquals(GRID_CNT + 1, cnt.get()); @@ -929,7 +929,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(GRID_CNT, nodeIds.size()); assertEquals(GRID_CNT, cnt.get()); @@ -980,7 +980,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(GRID_CNT + 1, nodeIds.size()); assertEquals(GRID_CNT + 1, cnt.get()); @@ -1036,7 +1036,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { grid(0).compute().broadcast(F.noop()); - assert latch.await(2, SECONDS); + assert latch.await(10, SECONDS) : latch; assertEquals(GRID_CNT, nodeIds.size()); assertEquals(GRID_CNT, cnt.get()); @@ -1145,7 +1145,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - public void testMultithreadedWithNodeRestart() throws Exception { + public void _testMultithreadedWithNodeRestart() throws Exception { final AtomicBoolean stop = new AtomicBoolean(); final BlockingQueue<IgniteBiTuple<Integer, UUID>> queue = new LinkedBlockingQueue<>(); final Collection<UUID> started = new GridConcurrentHashSet<>(); @@ -1153,9 +1153,11 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final Random rnd = new Random(); + final int consumeCnt = tcpDiscovery() ? CONSUME_CNT : CONSUME_CNT / 2; + IgniteInternalFuture<?> starterFut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { - for (int i = 0; i < CONSUME_CNT; i++) { + for (int i = 0; i < consumeCnt; i++) { int idx = rnd.nextInt(GRID_CNT); try { http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java index c1af323..8f03c4c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java @@ -49,6 +49,9 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { /** Number of grids started for tests. */ private static final int NODES_CNT = 4; + /** */ + private static final int CLIENT_IDX = 1; + /** Test singleton service name. */ private static final String SINGLETON_NAME = "testSingleton"; @@ -61,11 +64,11 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { cfg.setMarshaller(new BinaryMarshaller()); - cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder).setForceServerMode(true)); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); cfg.setCacheConfiguration(); - if (igniteInstanceName.equals(getTestIgniteInstanceName(0))) + if (igniteInstanceName.equals(getTestIgniteInstanceName(CLIENT_IDX))) cfg.setClientMode(true); return cfg; @@ -88,8 +91,10 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { public void testDefaultClosure() throws Exception { Set<String> srvNames = new HashSet<>(NODES_CNT - 1); - for (int i = 1; i < NODES_CNT; ++i) - srvNames.add(getTestIgniteInstanceName(i)); + for (int i = 0; i < NODES_CNT; ++i) { + if (i != CLIENT_IDX) + srvNames.add(getTestIgniteInstanceName(i)); + } for (int i = 0 ; i < NODES_CNT; i++) { log.info("Iteration: " + i); @@ -137,7 +142,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { assertEquals(1, res.size()); - assertEquals(getTestIgniteInstanceName(0), F.first(res)); + assertEquals(getTestIgniteInstanceName(CLIENT_IDX), F.first(res)); } } @@ -168,7 +173,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testDefaultService() throws Exception { - UUID clientNodeId = grid(0).cluster().localNode().id(); + UUID clientNodeId = grid(CLIENT_IDX).cluster().localNode().id(); for (int i = 0 ; i < NODES_CNT; i++) { log.info("Iteration: " + i); @@ -209,7 +214,7 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testClientService() throws Exception { - UUID clientNodeId = grid(0).cluster().localNode().id(); + UUID clientNodeId = grid(CLIENT_IDX).cluster().localNode().id(); for (int i = 0 ; i < NODES_CNT; i++) { log.info("Iteration: " + i); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java index 5da9042..2d26b72 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/GridTestClockTimer.java @@ -32,6 +32,15 @@ public class GridTestClockTimer implements Runnable { } } + /** + * @return {@code True} if need start test time. + */ + public static boolean startTestTimer() { + synchronized (IgniteUtils.mux) { + return IgniteUtils.gridCnt == 0; + } + } + /** {@inheritDoc} */ @Override public void run() { while (true) { http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerMappingConsistencyTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerMappingConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerMappingConsistencyTest.java index cd8e757..78f3c03 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerMappingConsistencyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerMappingConsistencyTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -157,6 +158,9 @@ public class GridMarshallerMappingConsistencyTest extends GridCommonAbstractTest Ignite g2 = startGrid(2); startGrid(1); + assertTrue("Failed to wait for automatic grid activation", + GridTestUtils.waitForCondition(() -> g2.cluster().active(), getTestTimeout())); + IgniteCache<Integer, DummyObject> c2 = g2.cache(CACHE_NAME); assertEquals(k, c2.get(k).val); http://git-wip-us.apache.org/repos/asf/ignite/blob/a64b941d/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index 7541cec..a7c4521 100644 --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@ -24,7 +24,6 @@ import java.io.ObjectOutput; import java.io.Serializable; import java.net.URL; import java.net.URLClassLoader; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -37,22 +36,20 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.Ignite; -import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteMessaging; import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; +import org.apache.ignite.internal.DiscoverySpiTestListener; +import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; import org.apache.ignite.internal.processors.continuous.StartRoutineDiscoveryMessage; +import org.apache.ignite.internal.processors.continuous.StartRoutineDiscoveryMessageV2; import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessage; -import org.apache.ignite.internal.processors.marshaller.MappingAcceptedMessage; -import org.apache.ignite.internal.processors.marshaller.MappingProposedMessage; import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.typedef.P2; import org.apache.ignite.internal.util.typedef.PA; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.resources.IgniteInstanceResource; -import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -206,11 +203,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - TestTcpDiscoverySpi discoSpi = new TestTcpDiscoverySpi(); - - discoSpi.setIpFinder(ipFinder); - - cfg.setDiscoverySpi(discoSpi); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); return cfg; } @@ -1036,7 +1029,11 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser public void testAsyncOld() throws Exception { final AtomicInteger msgCnt = new AtomicInteger(); - TestTcpDiscoverySpi discoSpi = (TestTcpDiscoverySpi)ignite2.configuration().getDiscoverySpi(); + IgniteDiscoverySpi discoSpi = (IgniteDiscoverySpi)ignite2.configuration().getDiscoverySpi(); + + DiscoverySpiTestListener lsnr = new DiscoverySpiTestListener(); + + discoSpi.setInternalListener(lsnr); assertFalse(ignite2.message().isAsync()); @@ -1054,7 +1051,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser } }, IllegalStateException.class, null); - discoSpi.blockCustomEvent(); + lsnr.blockCustomEvent(StartRoutineDiscoveryMessage.class, StartRoutineDiscoveryMessageV2.class); final String topic = "topic"; @@ -1079,7 +1076,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser Assert.assertFalse(starFut.isDone()); - discoSpi.stopBlock(); + lsnr.stopBlockCustomEvents(); GridTestUtils.assertThrows(log, new Callable<Void>() { @Override public Void call() throws Exception { @@ -1095,7 +1092,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser Assert.assertTrue(starFut.isDone()); - discoSpi.blockCustomEvent(); + lsnr.blockCustomEvent(StopRoutineDiscoveryMessage.class); message(ignite1.cluster().forRemotes()).send(topic, "msg1"); @@ -1125,7 +1122,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser Assert.assertFalse(stopFut.isDone()); - discoSpi.stopBlock(); + lsnr.stopBlockCustomEvents(); stopFut.get(); @@ -1144,9 +1141,13 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser public void testAsync() throws Exception { final AtomicInteger msgCnt = new AtomicInteger(); - TestTcpDiscoverySpi discoSpi = (TestTcpDiscoverySpi)ignite2.configuration().getDiscoverySpi(); + IgniteDiscoverySpi discoSpi = (IgniteDiscoverySpi)ignite2.configuration().getDiscoverySpi(); - discoSpi.blockCustomEvent(); + DiscoverySpiTestListener lsnr = new DiscoverySpiTestListener(); + + discoSpi.setInternalListener(lsnr); + + lsnr.blockCustomEvent(StartRoutineDiscoveryMessage.class, StartRoutineDiscoveryMessageV2.class); final String topic = "topic"; @@ -1167,7 +1168,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser Assert.assertFalse(starFut.isDone()); - discoSpi.stopBlock(); + lsnr.stopBlockCustomEvents(); UUID id = starFut.get(); @@ -1175,7 +1176,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser Assert.assertTrue(starFut.isDone()); - discoSpi.blockCustomEvent(); + lsnr.blockCustomEvent(StopRoutineDiscoveryMessage.class); message(ignite1.cluster().forRemotes()).send(topic, "msg1"); @@ -1195,7 +1196,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser Assert.assertFalse(stopFut.isDone()); - discoSpi.stopBlock(); + lsnr.stopBlockCustomEvents(); stopFut.get(); @@ -1209,89 +1210,6 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser } /** - * - */ - static class TestTcpDiscoverySpi extends TcpDiscoverySpi { - /** */ - private boolean blockCustomEvt; - - /** */ - private final Object mux = new Object(); - - /** */ - private List<DiscoverySpiCustomMessage> blockedMsgs = new ArrayList<>(); - - /** {@inheritDoc} */ - @Override public void sendCustomEvent(DiscoverySpiCustomMessage msg) throws IgniteException { - synchronized (mux) { - if (blockCustomEvt) { - DiscoveryCustomMessage msg0 = GridTestUtils.getFieldValue(msg, "delegate"); - - if (msg0 instanceof MappingProposedMessage || msg0 instanceof MappingAcceptedMessage){ - super.sendCustomEvent(msg); - - return; - } - - if (msg0 instanceof StopRoutineDiscoveryMessage || msg0 instanceof StartRoutineDiscoveryMessage) { - log.info("Block custom message: " + msg0); - - blockedMsgs.add(msg); - - mux.notifyAll(); - - return; - } - } - } - - super.sendCustomEvent(msg); - } - - /** - * - */ - public void blockCustomEvent() { - synchronized (mux) { - assert blockedMsgs.isEmpty() : blockedMsgs; - - blockCustomEvt = true; - } - } - - /** - * @throws InterruptedException If interrupted. - */ - public void waitCustomEvent() throws InterruptedException { - synchronized (mux) { - while (blockedMsgs.isEmpty()) - mux.wait(); - } - } - - /** - * - */ - public void stopBlock() { - List<DiscoverySpiCustomMessage> msgs; - - synchronized (this) { - msgs = new ArrayList<>(blockedMsgs); - - blockCustomEvt = false; - - blockedMsgs.clear(); - } - - for (DiscoverySpiCustomMessage msg : msgs) { - log.info("Resend blocked message: " + msg); - - super.sendCustomEvent(msg); - } - } - } - - /** * Tests that message listener registers only for one oldest node. * * @throws Exception If an error occurred.
