ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: test
Date Tue, 27 Dec 2016 11:23:53 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.8.2-noack c2de97879 -> 9283f014c


test


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9283f014
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9283f014
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9283f014

Branch: refs/heads/ignite-1.8.2-noack
Commit: 9283f014c304c31d849501a7913d825301185870
Parents: c2de978
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Dec 27 14:23:50 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Dec 27 14:23:50 2016 +0300

----------------------------------------------------------------------
 .../communication/tcp/TcpCommunicationSpi.java  | 60 ++++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9283f014/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 c35b5ef..7400d7b 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
@@ -3611,20 +3611,20 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
                         recovery = recoveryDescs.get(new ConnectionKey(node.id(), client.connectionIndex(),
-1));
 
                         if (recovery != null && recovery.lastAcknowledged() != recovery.received())
{
-                            RecoveryLastReceivedMessage msg = new RecoveryLastReceivedMessage(recovery.received());
-
-                            if (log.isDebugEnabled())
-                                log.debug("Send recovery acknowledgement on timeout [rmtNode="
+ nodeId +
-                                    ", rcvCnt=" + msg.received() + ']');
-
-                            try {
-                                nioSrvr.sendSystem(((GridTcpNioCommunicationClient)client).session(),
msg);
-
-                                recovery.lastAcknowledged(msg.received());
-                            }
-                            catch (IgniteCheckedException err) {
-                                U.error(log, "Failed to send message: " + err, err);
-                            }
+//                            RecoveryLastReceivedMessage msg = new RecoveryLastReceivedMessage(recovery.received());
+//
+//                            if (log.isDebugEnabled())
+//                                log.debug("Send recovery acknowledgement on timeout [rmtNode="
+ nodeId +
+//                                    ", rcvCnt=" + msg.received() + ']');
+//
+//                            try {
+//                                nioSrvr.sendSystem(((GridTcpNioCommunicationClient)client).session(),
msg);
+//
+//                                recovery.lastAcknowledged(msg.received());
+//                            }
+//                            catch (IgniteCheckedException err) {
+//                                U.error(log, "Failed to send message: " + err, err);
+//                            }
 
                             continue;
                         }
@@ -3672,22 +3672,22 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
          */
         private void sendAckOnTimeout(GridNioRecoveryDescriptor recovery, GridNioSession
ses) {
             if (recovery != null && recovery.lastAcknowledged() != recovery.received())
{
-                RecoveryLastReceivedMessage msg = new RecoveryLastReceivedMessage(recovery.received());
-
-                if (log.isDebugEnabled()) {
-                    log.debug("Send recovery acknowledgement on timeout [rmtNode=" + recovery.node().id()
+
-                        ", rcvCnt=" + msg.received() +
-                        ", lastAcked=" + recovery.lastAcknowledged() + ']');
-                }
-
-                try {
-                    nioSrvr.sendSystem(ses, msg);
-
-                    recovery.lastAcknowledged(msg.received());
-                }
-                catch (IgniteCheckedException e) {
-                    U.error(log, "Failed to send message: " + e, e);
-                }
+//                RecoveryLastReceivedMessage msg = new RecoveryLastReceivedMessage(recovery.received());
+//
+//                if (log.isDebugEnabled()) {
+//                    log.debug("Send recovery acknowledgement on timeout [rmtNode=" + recovery.node().id()
+
+//                        ", rcvCnt=" + msg.received() +
+//                        ", lastAcked=" + recovery.lastAcknowledged() + ']');
+//                }
+//
+//                try {
+//                    nioSrvr.sendSystem(ses, msg);
+//
+//                    recovery.lastAcknowledged(msg.received());
+//                }
+//                catch (IgniteCheckedException e) {
+//                    U.error(log, "Failed to send message: " + e, e);
+//                }
             }
         }
 


Mime
View raw message