Repository: ignite Updated Branches: refs/heads/ignite-1758 a4beb150e -> 3f996cecb
ignite-1758 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3f996cec Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3f996cec Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3f996cec Branch: refs/heads/ignite-1758 Commit: 3f996cecb02c4bd3e47a5bc8e3507ae0538c6686 Parents: a4beb15 Author: sboikov <sboi...@gridgain.com> Authored: Mon Oct 26 13:07:53 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Oct 26 13:07:53 2015 +0300 ---------------------------------------------------------------------- .../spi/communication/tcp/TcpCommunicationSpi.java | 7 ++++++- .../org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 12 +++++++++--- .../discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 5 ++++- 3 files changed, 19 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3f996cec/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 9b5ddde..99c6145 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 @@ -2295,9 +2295,14 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter return null; } - if (getSpiContext().node(node.id()) == null) + if (getSpiContext().node(node.id()) == null) { + recoveryDesc.release(); + + U.closeQuiet(ch); + throw new ClusterTopologyCheckedException("Failed to send message, " + "node left cluster: " + node); + } long rcvCnt = -1; http://git-wip-us.apache.org/repos/asf/ignite/blob/3f996cec/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 7e5af5a..03ae201 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 @@ -98,6 +98,7 @@ import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCOVERY_HISTORY_SIZE; import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED; import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; @@ -270,8 +271,6 @@ class ClientImpl extends TcpDiscoveryImpl { /** {@inheritDoc} */ @Override public void spiStop() throws IgniteSpiException { - timer.cancel(); - if (msgWorker != null && msgWorker.isAlive()) { // Should always be alive msgWorker.addMessage(SPI_STOP); @@ -297,6 +296,8 @@ class ClientImpl extends TcpDiscoveryImpl { U.join(sockWriter, log); U.join(sockReader, log); + timer.cancel(); + spi.printStopInfo(); } @@ -1236,8 +1237,13 @@ class ClientImpl extends TcpDiscoveryImpl { return; } - else + else { + U.warn(log, "Client failed to reconnect because failed to restore discovery " + + "messages history, consider increasing '" + + IGNITE_DISCOVERY_HISTORY_SIZE + "' system property."); + return; + } } } else if (spi.ensured(msg)) { http://git-wip-us.apache.org/repos/asf/ignite/blob/3f996cec/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java index 53129a3..044ea44 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java @@ -183,9 +183,10 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { stopGrid(idx); startGrid(idx); } - } catch (Throwable e) { + log.error("Unexpected error: " + e, e); + error.compareAndSet(null, e); return null; @@ -218,6 +219,8 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { } } catch (Throwable e) { + log.error("Unexpected error: " + e, e); + error.compareAndSet(null, e); return null;
