Repository: incubator-ignite Updated Branches: refs/heads/ignite-752 c399a828f -> b1a2936e5
ignite-752: reverted socket write timeout changes Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b1a2936e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b1a2936e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b1a2936e Branch: refs/heads/ignite-752 Commit: b1a2936e56619a19d9ba11a23a3c84ee0280bbf0 Parents: c399a82 Author: Denis Magda <[email protected]> Authored: Wed Jul 22 08:57:55 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Wed Jul 22 08:57:55 2015 +0300 ---------------------------------------------------------------------- .../spi/communication/tcp/TcpCommunicationSpi.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1a2936e/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 b24d424..6196e9e 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 @@ -236,12 +236,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter new GridNioServerListenerAdapter<Message>() { @Override public void onSessionWriteTimeout(GridNioSession ses) { LT.warn(log, null, "Communication SPI Session write timed out (consider increasing " + - (!failureDetectionThresholdEnabled() ? "'socketWriteTimeout' " + "configuration property) [remoteAddr=" + ses.remoteAddress() + - ", writeTimeout=" + sockWriteTimeout + ']' : - "'failureDetectionThreshold' " + "configuration property) [remoteAddr=" + ses.remoteAddress() + - ", failureDetectionThreshold=" + failureDetectionThreshold()) + ']' - ); + ", writeTimeout=" + sockWriteTimeout + ']'); if (log.isDebugEnabled()) log.debug("Closing communication SPI session on write timeout [remoteAddr=" + ses.remoteAddress() + @@ -916,16 +912,12 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter * socket within this time then connection is closed and reconnect is attempted. * <p> * Default to {@link #DFLT_SOCK_WRITE_TIMEOUT}. - * <p> - * When this property is explicitly set {@link IgniteConfiguration#getFailureDetectionThreshold()} is ignored. * * @param sockWriteTimeout Socket write timeout for TCP connection. */ @IgniteSpiConfiguration(optional = true) public void setSocketWriteTimeout(long sockWriteTimeout) { this.sockWriteTimeout = sockWriteTimeout; - - failureDetectionThresholdEnabled(false); } /** {@inheritDoc} */ @@ -1302,9 +1294,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter assertParameter(reconCnt > 0, "reconnectCnt > 0"); assertParameter(connTimeout >= 0, "connTimeout >= 0"); assertParameter(maxConnTimeout >= connTimeout, "maxConnTimeout >= connTimeout"); - assertParameter(sockWriteTimeout >= 0, "sockWriteTimeout >= 0"); } + assertParameter(sockWriteTimeout >= 0, "sockWriteTimeout >= 0"); assertParameter(ackSndThreshold > 0, "ackSndThreshold > 0"); assertParameter(unackedMsgsBufSize >= 0, "unackedMsgsBufSize >= 0"); @@ -1542,8 +1534,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter .sendQueueLimit(msgQueueLimit) .directMode(true) .metricsListener(metricsLsnr) - .writeTimeout(failureDetectionThresholdEnabled() ? failureDetectionThreshold() : - sockWriteTimeout) + .writeTimeout(sockWriteTimeout) .filters(new GridNioCodecFilter(parser, log, true), new GridConnectionBytesVerifyFilter(log)) .messageFormatter(msgFormatter)
