ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject ignite git commit: merge from master
Date Tue, 17 Jan 2017 15:56:48 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-comm-balance-master ecd727c4d -> 983c9bd48


merge from master


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/983c9bd4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/983c9bd4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/983c9bd4

Branch: refs/heads/ignite-comm-balance-master
Commit: 983c9bd48965de0696b697c106f8cfbf855004cf
Parents: ecd727c
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Tue Jan 17 18:56:37 2017 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Tue Jan 17 18:56:37 2017 +0300

----------------------------------------------------------------------
 .../ignite/spi/communication/tcp/TcpCommunicationSpi.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/983c9bd4/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 be79414..9601ab1 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
@@ -1125,7 +1125,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 
             if (usePairedConnections == null) {
                 // If not set, by default should be true for server and false for client.
-                usePairedConnections = !ignite.configuration().isClientMode();
+                Boolean clientMode = ignite.configuration().isClientMode();
+
+                usePairedConnections = !clientMode;
+
+                connectionsPerNode = clientMode ? 1 : 2;
             }
         }
     }
@@ -3324,7 +3328,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
      * @return {@code True} if given node supports multiple connections per-node for communication.
      */
     private boolean useMultipleConnections(ClusterNode node) {
-        return node.version().compareToIgnoreTimestamp(MULTIPLE_CONN_SINCE_VER) >= 0;
+        return node.version().compareToIgnoreTimestamp(MULTIPLE_CONN_SINCE_VER) >= 0 &&
!node.isClient();
     }
 
     /**


Mime
View raw message