You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/20 16:50:09 UTC
[2/2] incubator-ignite git commit: Merge branch 'ignite-1003' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1003
Merge branch 'ignite-1003' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1003
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b10b3010
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b10b3010
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b10b3010
Branch: refs/heads/ignite-1003
Commit: b10b301067358a0b3f7fdda4ed7c96e38cc72700
Parents: 22b86aa da1e46c
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Jul 20 17:49:12 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Jul 20 17:49:12 2015 +0300
----------------------------------------------------------------------
.../discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b10b3010/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index c60995a,0722f38..9afe5e6
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@@ -88,12 -88,12 +88,12 @@@ public class TcpDiscoveryMultiThreadedT
ipFinder.setAddresses(srvAddresses);
- cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder).setNetworkTimeout(10_000).
- setSocketTimeout(10_000).setHeartbeatFrequency(10_000));
+ cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder).setNetworkTimeout(17_000).
+ setSocketTimeout(17_000).setHeartbeatFrequency(10_000).setAckTimeout(17_000));
}
else
- cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder).setNetworkTimeout(10_000).
- setSocketTimeout(10_000).setHeartbeatFrequency(10_000));
+ cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder).setNetworkTimeout(17_000).
+ setSocketTimeout(17_000).setHeartbeatFrequency(10_000).setAckTimeout(17_000));
TcpCommunicationSpi commSpi = new TcpCommunicationSpi();
commSpi.setConnectTimeout(17_000);