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/04/24 15:03:35 UTC
[12/50] [abbrv] ignite git commit: Some discovery have been done
Some discovery have been done
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4fd39653
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4fd39653
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4fd39653
Branch: refs/heads/ignite-3054
Commit: 4fd39653d24f62f19f70b4dffba8497185cc46fb
Parents: 6acf193
Author: Alexandr Kuramshin <ak...@gridgain.com>
Authored: Sat Nov 19 19:39:10 2016 +0300
Committer: Alexandr Kuramshin <ak...@gridgain.com>
Committed: Sat Nov 19 19:39:10 2016 +0300
----------------------------------------------------------------------
.../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 2 ++
.../tcp/IgniteTcpCommunicationBigClusterTest.java | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4fd39653/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
old mode 100644
new mode 100755
index 1fe437c..afd4db2
--- 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
@@ -501,6 +501,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
GridTcpNioCommunicationClient client =
connected(recoveryDesc, ses, rmtNode, msg0.received(), true, !hasShmemClient);
+ // here the RecoveryLastReceivedMessage is in the session queue
fut.onDone(client);
}
finally {
@@ -2746,6 +2747,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
i += read;
}
+ // will got here rcvCnt = 0 if read timeout have been occurred and the channel was closed
rcvCnt = buf.getLong(1);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4fd39653/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationBigClusterTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationBigClusterTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationBigClusterTest.java
index 86a84f3..a0e545e 100755
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationBigClusterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationBigClusterTest.java
@@ -34,7 +34,10 @@ public class IgniteTcpCommunicationBigClusterTest extends GridCommonAbstractTest
private static final long RUNNING_TIMESPAN = 1_000L;
/** */
- private static final long ADDED_MESSAGE_DELAY = 1_000L;
+ private static final long COMMUNICATION_TIMEOUT = 1_000L;
+
+ /** Should be about of the COMMUNICATION_TIMEOUT value to get the error */
+ private static final long ADDED_MESSAGE_DELAY = COMMUNICATION_TIMEOUT;
/** */
private static final long BROADCAST_PERIOD = 100L;
@@ -61,8 +64,8 @@ public class IgniteTcpCommunicationBigClusterTest extends GridCommonAbstractTest
cfg.setDiscoverySpi(discovery);
TcpCommunicationSpi communication = new TcpCommunicationSpi();
- communication.setConnectTimeout(500L);
- communication.setMaxConnectTimeout(500L);
+ communication.setConnectTimeout(COMMUNICATION_TIMEOUT);
+ communication.setMaxConnectTimeout(COMMUNICATION_TIMEOUT);
communication.setReconnectCount(1);
cfg.setCommunicationSpi(communication);