Repository: ignite Updated Branches: refs/heads/master 7637ed99e -> 73902a237
IGNITE-5965 Ignite Basic: Flaky failure of GridServiceProcessorMultiNodeConfigSelfTest.testDeployOnEachNodeUpdateTopology - Fixes #3988. Signed-off-by: Ivan Rakov <ira...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73902a23 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73902a23 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73902a23 Branch: refs/heads/master Commit: 73902a237f7d3d0272ec535bc8d59f24684d0f1e Parents: 7637ed9 Author: AMedvedev <amedve...@gridgain.com> Authored: Mon May 14 17:20:33 2018 +0300 Committer: Ivan Rakov <ira...@apache.org> Committed: Mon May 14 17:20:33 2018 +0300 ---------------------------------------------------------------------- .../service/GridServiceProcessorAbstractSelfTest.java | 4 ++-- .../GridServiceProcessorMultiNodeConfigSelfTest.java | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/73902a23/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java index 9affe85..6d3b0d4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java @@ -795,7 +795,7 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs @Override public boolean applyx() { return actualCount(srvcName, g.services().serviceDescriptors()) == expectedDeps; } - }, 1500); + }, 12_000); } /** @@ -972,4 +972,4 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/73902a23/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java index bd47b53..e43d029 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java @@ -22,8 +22,10 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import org.apache.ignite.Ignite; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.lang.GridAbsPredicateX; import org.apache.ignite.services.ServiceConfiguration; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.testframework.GridTestUtils; /** @@ -108,6 +110,15 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc } /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(final String igniteInstanceName) throws Exception { + final IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setIdleConnectionTimeout(10000); + + return cfg; + } + + /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { super.beforeTestsStarted(); @@ -324,4 +335,4 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc checkCount(name, g.services().serviceDescriptors(), nodeCount()); } -} \ No newline at end of file +}
