Merge remote-tracking branch 'remotes/origin/master' into ignite-zk-ce # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java # modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/78a994a9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/78a994a9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/78a994a9 Branch: refs/heads/ignite-zk-ce Commit: 78a994a98800120680bcf58b727e2978bffeb531 Parents: 60b625a e358ae2 Author: sboikov <[email protected]> Authored: Fri Dec 15 14:25:10 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Dec 15 14:25:10 2017 +0300 ---------------------------------------------------------------------- .../communication/GridIoMessageFactory.java | 9 +- .../spi/communication/tcp/HandshakeMessage.java | 156 ------------------ .../communication/tcp/HandshakeMessage2.java | 95 ----------- .../spi/communication/tcp/NodeIdMessage.java | 115 -------------- .../tcp/RecoveryLastReceivedMessage.java | 113 ------------- .../communication/tcp/TcpCommunicationSpi.java | 31 ++-- .../tcp/messages/HandshakeMessage.java | 157 +++++++++++++++++++ .../tcp/messages/HandshakeMessage2.java | 95 +++++++++++ .../tcp/messages/NodeIdMessage.java | 128 +++++++++++++++ .../messages/RecoveryLastReceivedMessage.java | 114 ++++++++++++++ .../tcp/messages/package-info.java | 22 +++ 11 files changed, 541 insertions(+), 494 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/78a994a9/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/78a994a9/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index d4ccc33,69da9ca..3588a79 --- 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 @@@ -135,7 -132,10 +135,11 @@@ import org.apache.ignite.spi.IgniteSpiT import org.apache.ignite.spi.IgniteSpiTimeoutObject; import org.apache.ignite.spi.communication.CommunicationListener; import org.apache.ignite.spi.communication.CommunicationSpi; + import org.apache.ignite.spi.communication.tcp.messages.HandshakeMessage; + import org.apache.ignite.spi.communication.tcp.messages.HandshakeMessage2; + import org.apache.ignite.spi.communication.tcp.messages.NodeIdMessage; + import org.apache.ignite.spi.communication.tcp.messages.RecoveryLastReceivedMessage; +import org.apache.ignite.spi.communication.tcp.internal.TcpCommunicationConnectionCheckFuture; import org.apache.ignite.spi.discovery.DiscoverySpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.thread.IgniteThread;
