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/17 08:29:02 UTC
[50/50] [abbrv] incubator-ignite git commit: ignite-752: merge from
master
ignite-752: merge from master
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6bb1875f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6bb1875f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6bb1875f
Branch: refs/heads/ignite-752
Commit: 6bb1875fd56bb4b0a58a184c814a7f7d51e5820d
Parents: 37198ca
Author: Denis Magda <dm...@gridgain.com>
Authored: Fri Jul 17 09:27:50 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri Jul 17 09:27:50 2015 +0300
----------------------------------------------------------------------
.../spi/communication/tcp/TcpCommunicationSpi.java | 2 +-
.../apache/ignite/spi/discovery/tcp/ClientImpl.java | 13 +++++--------
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 5 ++---
.../internal/IgniteClientReconnectAbstractTest.java | 2 +-
4 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb1875f/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 06804ed..be75ab2 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
@@ -1297,7 +1297,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
"Specified 'unackedMsgsBufSize' is too low, it should be at least 'msgQueueLimit * 5'.");
assertParameter(unackedMsgsBufSize >= ackSndThreshold * 5,
- "Specified 'unackedMsgsBufSize' is too low, it should be at least 'ackSndThreshold * 5'.");
+ "Specified 'unackedMsgsBufSize' is too low, it should be at least 'ackSndThreshold * 5'.");
}
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb1875f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 4fff162..00c668a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -1097,12 +1097,10 @@ class ClientImpl extends TcpDiscoveryImpl {
else
U.error(log, "Failed to reconnect to cluster " +
(spi.failureDetectionThresholdEnabled() ?
- "(consider increasing 'failureDetectionThreshold' configuration property) " +
- "[failureDetectionThreshold=" + spi.failureDetectionThreshold()
- :
- "(consider increasing 'networkTimeout' configuration property) [networkTimeout="
- + spi.getNetworkTimeout())
- + ", sock=" + sock + ']');
+ "(consider increasing 'failureDetectionThreshold' configuration property) " +
+ "[failureDetectionThreshold=" + spi.failureDetectionThreshold() :
+ "(consider increasing 'networkTimeout' configuration property) [networkTimeout=" +
+ spi.getNetworkTimeout()) + ", sock=" + sock + ']');
return;
}
@@ -1182,8 +1180,7 @@ class ClientImpl extends TcpDiscoveryImpl {
msg = "Failed to reconnect to cluster " +
(spi.failureDetectionThresholdEnabled() ?
"(consider increasing 'failureDetectionThreshold' configuration property) " +
- "[failureDetectionThreshold=" + spi.failureDetectionThreshold()
- :
+ "[failureDetectionThreshold=" + spi.failureDetectionThreshold() :
"(consider increasing 'networkTimeout' configuration property) " +
"[networkTimeout=" + spi.getNetworkTimeout()) + ", sock=" + sock + ']';
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb1875f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 09b2a2c..8d99bcd 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1154,8 +1154,6 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
sock.setTcpNoDelay(true);
- long startTs = U.currentTimeMillis();
-
sock.connect(resolved, (int)timeoutCtrl.nextTimeoutChunk(sockTimeout));
writeToSocket(sock, U.IGNITE_HEADER, timeoutCtrl.nextTimeoutChunk(sockTimeout));
@@ -1603,7 +1601,8 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
impl = new ClientImpl(this);
ctxInitLatch.countDown();
- } else {
+ }
+ else {
if (!failureDetectionThresholdEnabled()) {
if (ackTimeout == 0)
ackTimeout = DFLT_ACK_TIMEOUT;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb1875f/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
index 3af6fd8..7247d54 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
@@ -293,7 +293,7 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra
}
}
- super.writeToSocket(sock, msg, getSocketTimeout());
+ super.writeToSocket(sock, msg, timeout);
}
}