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 2017/03/13 09:07:39 UTC
[32/50] [abbrv] ignite git commit: ignite-4577 Add non-reachable
addresses at the end of addresses list
ignite-4577 Add non-reachable addresses at the end of addresses list
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f7947150
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f7947150
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f7947150
Branch: refs/heads/ignite-4768
Commit: f79471501d3d629a8cf942875bd883f42ba5c712
Parents: 4972020
Author: Evgenii Zhuravlev <ez...@gridgain.com>
Authored: Tue Mar 7 14:32:28 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 7 14:32:28 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/util/IgniteUtils.java | 14 ++++++-----
.../communication/tcp/TcpCommunicationSpi.java | 25 ++++++++++++++++++++
2 files changed, 33 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7947150/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index f6c8163..74e4450 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -1850,15 +1850,16 @@ public abstract class IgniteUtils {
/**
* @param addrs Addresses.
+ * @return List of reachable addresses.
*/
- public static List<InetAddress> filterReachable(List<InetAddress> addrs) {
+ public static List<InetAddress> filterReachable(Collection<InetAddress> addrs) {
final int reachTimeout = 2000;
if (addrs.isEmpty())
return Collections.emptyList();
if (addrs.size() == 1) {
- InetAddress addr = addrs.get(0);
+ InetAddress addr = F.first(addrs);
if (reachable(addr, reachTimeout))
return Collections.singletonList(addr);
@@ -1874,8 +1875,7 @@ public abstract class IgniteUtils {
for (final InetAddress addr : addrs) {
futs.add(executor.submit(new Runnable() {
- @Override
- public void run() {
+ @Override public void run() {
if (reachable(addr, reachTimeout)) {
synchronized (res) {
res.add(addr);
@@ -1888,11 +1888,13 @@ public abstract class IgniteUtils {
for (Future<?> fut : futs) {
try {
fut.get();
- } catch (InterruptedException e) {
+ }
+ catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new IgniteException("Thread has been interrupted.", e);
- } catch (ExecutionException e) {
+ }
+ catch (ExecutionException e) {
throw new IgniteException(e);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7947150/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 2664505..30c6976 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -2776,6 +2776,31 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
if (isExtAddrsExist)
addrs.addAll(extAddrs);
+ Set<InetAddress> allInetAddrs = U.newHashSet(addrs.size());
+
+ for (InetSocketAddress addr : addrs)
+ allInetAddrs.add(addr.getAddress());
+
+ List<InetAddress> reachableInetAddrs = U.filterReachable(allInetAddrs);
+
+ if (reachableInetAddrs.size() < allInetAddrs.size()) {
+ LinkedHashSet<InetSocketAddress> addrs0 = U.newLinkedHashSet(addrs.size());
+
+ for (InetSocketAddress addr : addrs) {
+ if (reachableInetAddrs.contains(addr.getAddress()))
+ addrs0.add(addr);
+ }
+ for (InetSocketAddress addr : addrs) {
+ if (!reachableInetAddrs.contains(addr.getAddress()))
+ addrs0.add(addr);
+ }
+
+ addrs = addrs0;
+ }
+
+ if (log.isDebugEnabled())
+ log.debug("Addresses to connect for node [rmtNode=" + node.id() + ", addrs=" + addrs.toString() + ']');
+
boolean conn = false;
GridCommunicationClient client = null;
IgniteCheckedException errs = null;