Repository: ignite Updated Branches: refs/heads/ignite-1537 7ebc2ffd9 -> 5b2f375d5
ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5b2f375d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5b2f375d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5b2f375d Branch: refs/heads/ignite-1537 Commit: 5b2f375d56a175911922bdda61bacaaf2f423271 Parents: 7ebc2ff Author: sboikov <[email protected]> Authored: Tue Dec 22 12:54:57 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Dec 22 13:23:10 2015 +0300 ---------------------------------------------------------------------- .../distributed/IgniteCacheManyClientsTest.java | 2 ++ .../service/ClosureServiceClientsNodesTest.java | 22 ++++++++++++++++---- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 6 ++++++ 3 files changed, 26 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5b2f375d/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 242b12d..8d4af19 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 @@ -65,6 +65,8 @@ public class IgniteCacheManyClientsTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + cfg.setFailureDetectionTimeout(20_000); + cfg.setConnectorConfiguration(null); cfg.setPeerClassLoadingEnabled(false); cfg.setTimeServerPortRange(200); http://git-wip-us.apache.org/repos/asf/ignite/blob/5b2f375d/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 b529b6c..49c6968 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 @@ -27,6 +27,7 @@ import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgniteCallable; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; @@ -38,6 +39,7 @@ import org.apache.ignite.services.ServiceDescriptor; 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; /** @@ -171,14 +173,20 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { for (int i = 0 ; i < NODES_CNT; i++) { log.info("Iteration: " + i); - Ignite ignite = grid(i); + final Ignite ignite = grid(i); ignite.services().deployNodeSingleton(SINGLETON_NAME, new TestService()); - ClusterGroup grp = ignite.cluster(); + final ClusterGroup grp = ignite.cluster(); assertEquals(NODES_CNT, grp.nodes().size()); + GridTestUtils.waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return ignite.services(grp).serviceDescriptors().size() == 1; + } + }, 5000); + Collection<ServiceDescriptor> srvDscs = ignite.services(grp).serviceDescriptors(); assertEquals(1, srvDscs.size()); @@ -206,14 +214,20 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest { for (int i = 0 ; i < NODES_CNT; i++) { log.info("Iteration: " + i); - Ignite ignite = grid(i); + final Ignite ignite = grid(i); ignite.services(ignite.cluster().forClients()).deployNodeSingleton(SINGLETON_NAME, new TestService()); - ClusterGroup grp = ignite.cluster(); + final ClusterGroup grp = ignite.cluster(); assertEquals(NODES_CNT, grp.nodes().size()); + GridTestUtils.waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return ignite.services(grp).serviceDescriptors().size() == 1; + } + }, 5000); + Collection<ServiceDescriptor> srvDscs = ignite.services(grp).serviceDescriptors(); assertEquals(1, srvDscs.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/5b2f375d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java index 5af0596..dcab5b2 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java @@ -912,6 +912,12 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest { } }, timeout); + if (ipFinder.getRegisteredAddresses().size() != 1) { + log.error("Failed to wait for IP cleanup, will dump threads."); + + U.dumpThreads(log); + } + assert ipFinder.getRegisteredAddresses().size() == 1 : "ipFinder=" + ipFinder.getRegisteredAddresses(); // Check that missing addresses are returned back.
