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 2016/09/27 15:18:39 UTC
[3/9] ignite git commit: ignite-3973 In
TcpDiscoveryMulticastIpFinder.requestAddresses wait full timeout for remote
addresses
ignite-3973 In TcpDiscoveryMulticastIpFinder.requestAddresses wait full timeout for remote addresses
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c8dc92ec
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c8dc92ec
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c8dc92ec
Branch: refs/heads/ignite-3601p
Commit: c8dc92ecc8a5d76e68d2d75f12158e0a581a0326
Parents: c2a3f11
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 27 15:17:05 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 27 15:17:05 2016 +0300
----------------------------------------------------------------------
.../tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java | 3 ---
.../spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java | 2 +-
.../apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +-
.../multicast/TcpDiscoveryMulticastIpFinderSelfTest.java | 6 +++---
4 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8dc92ec/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
index d5b3dae..5bbe90e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
@@ -618,9 +618,6 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
U.close(sock);
}
- if (rmtAddrs.size() > locNodeAddrs.size())
- break;
-
if (i < addrReqAttempts - 1) // Wait some time before re-sending address request.
U.sleep(200);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8dc92ec/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
index 27ce883..ba8fe73 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
@@ -58,7 +58,7 @@ public class TcpClientDiscoverySpiMulticastTest extends GridCommonAbstractTest {
TcpDiscoveryMulticastIpFinder ipFinder = new TcpDiscoveryMulticastIpFinder();
- ipFinder.setAddressRequestAttempts(10);
+ ipFinder.setAddressRequestAttempts(5);
spi.setIpFinder(ipFinder);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8dc92ec/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 035c6fe..1ce98a5 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
@@ -181,7 +181,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
else if (gridName.contains("MulticastIpFinder")) {
TcpDiscoveryMulticastIpFinder finder = new TcpDiscoveryMulticastIpFinder();
- finder.setAddressRequestAttempts(10);
+ finder.setAddressRequestAttempts(5);
finder.setMulticastGroup(GridTestUtils.getNextMulticastGroup(getClass()));
finder.setMulticastPort(GridTestUtils.getNextMulticastPort(getClass()));
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8dc92ec/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinderSelfTest.java
index 90fdb0a..29ed595 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinderSelfTest.java
@@ -59,19 +59,19 @@ public class TcpDiscoveryMulticastIpFinderSelfTest
try {
ipFinder1 = ipFinder();
ipFinder1.setResponseWaitTime(1000);
- ipFinder1.setAddressRequestAttempts(10);
+ ipFinder1.setAddressRequestAttempts(5);
ipFinder2 = new TcpDiscoveryMulticastIpFinder();
ipFinder2.setResponseWaitTime(1000);
- ipFinder2.setAddressRequestAttempts(10);
+ ipFinder2.setAddressRequestAttempts(5);
ipFinder2.setMulticastGroup(ipFinder1.getMulticastGroup());
ipFinder2.setMulticastPort(ipFinder1.getMulticastPort());
ipFinder3 = new TcpDiscoveryMulticastIpFinder();
ipFinder3.setResponseWaitTime(1000);
- ipFinder3.setAddressRequestAttempts(10);
+ ipFinder3.setAddressRequestAttempts(5);
ipFinder3.setMulticastGroup(ipFinder1.getMulticastGroup());
ipFinder3.setMulticastPort(ipFinder1.getMulticastPort());