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 2016/12/27 10:43:19 UTC
ignite git commit: ignite-1.8.2 disabled acks in communication for
testing
Repository: ignite
Updated Branches:
refs/heads/ignite-1.8.2-noack [created] 92868c30c
ignite-1.8.2 disabled acks in communication for testing
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/92868c30
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/92868c30
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/92868c30
Branch: refs/heads/ignite-1.8.2-noack
Commit: 92868c30c2ff462d431c8670dab6ec52717ad4ea
Parents: 8372e69
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 27 13:43:18 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 27 13:43:18 2016 +0300
----------------------------------------------------------------------
.../util/nio/GridNioRecoveryDescriptor.java | 32 --------------------
.../ignite/internal/util/nio/GridNioServer.java | 16 ----------
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
3 files changed, 1 insertion(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/92868c30/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
index 6258c13..1c27854 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioRecoveryDescriptor.java
@@ -175,20 +175,6 @@ public class GridNioRecoveryDescriptor {
* @return {@code False} if queue limit is exceeded.
*/
public boolean add(SessionWriteRequest req) {
- assert req != null;
-
- if (!req.skipRecovery()) {
- if (resendCnt == 0) {
- msgReqs.addLast(req);
-
- sentCnt++;
-
- return msgReqs.size() < queueLimit;
- }
- else
- resendCnt--;
- }
-
return true;
}
@@ -196,24 +182,6 @@ public class GridNioRecoveryDescriptor {
* @param rcvCnt Number of messages received by remote node.
*/
public void ackReceived(long rcvCnt) {
- if (log.isDebugEnabled())
- log.debug("Handle acknowledgment [acked=" + acked + ", rcvCnt=" + rcvCnt +
- ", msgReqs=" + msgReqs.size() + ']');
-
- while (acked < rcvCnt) {
- SessionWriteRequest req = msgReqs.pollFirst();
-
- assert req != null : "Missed message [rcvCnt=" + rcvCnt +
- ", acked=" + acked +
- ", desc=" + this + ']';
-
- if (req.ackClosure() != null)
- req.ackClosure().apply(null);
-
- req.onAckReceived();
-
- acked++;
- }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/92868c30/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index bc1f173..5010917 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -1099,12 +1099,6 @@ public class GridNioServer<T> {
readBuf.compact();
else
readBuf.clear();
-
- if (ses.hasSystemMessage() && !ses.procWrite.get()) {
- ses.procWrite.set(true);
-
- registerWrite(ses);
- }
}
catch (IgniteCheckedException e) {
close(ses, e);
@@ -1340,16 +1334,6 @@ public class GridNioServer<T> {
* @return System message request.
*/
private SessionWriteRequest systemMessage(GridSelectorNioSessionImpl ses) {
- if (ses.hasSystemMessage()) {
- Object msg = ses.systemMessage();
-
- SessionWriteRequest req = new WriteRequestSystemImpl(ses, msg);
-
- assert !ses.hasSystemMessage();
-
- return req;
- }
-
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/92868c30/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..17d0f06 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
@@ -979,7 +979,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
private IpcSharedMemoryServerEndpoint shmemSrv;
/** */
- private boolean usePairedConnections = true;
+ private boolean usePairedConnections = false;
/** */
private int connectionsPerNode = DFLT_CONN_PER_NODE;