io optimizations
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cf32e459 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cf32e459 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cf32e459 Branch: refs/heads/ignite-comm-balance Commit: cf32e4593d7eb739e495ab796fcfb0f9ba5204e3 Parents: e62d549 Author: sboikov <[email protected]> Authored: Fri Oct 7 12:14:08 2016 +0300 Committer: sboikov <[email protected]> Committed: Fri Oct 7 12:14:08 2016 +0300 ---------------------------------------------------------------------- .../internal/util/nio/GridNioRecoveryDescriptor.java | 14 +++++++------- .../ignite/internal/util/nio/GridNioServer.java | 4 ++-- .../internal/util/nio/GridSelectorNioSessionImpl.java | 2 +- .../spi/communication/tcp/TcpCommunicationSpi.java | 4 ++-- .../GridTcpCommunicationSpiMultithreadedSelfTest.java | 6 +++--- .../GridTcpCommunicationSpiRecoveryAckSelfTest.java | 6 +++--- ...iteTcpCommunicationRecoveryAckClosureSelfTest.java | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cf32e459/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 dfc78be..1ecf5b0 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 @@ -185,16 +185,16 @@ public class GridNioRecoveryDescriptor { ", msgReqs=" + msgReqs.size() + ']'); while (acked < rcvCnt) { - SessionWriteRequest fut = msgReqs.pollFirst(); + SessionWriteRequest req = msgReqs.pollFirst(); - assert fut != null : "Missed message future [rcvCnt=" + rcvCnt + + assert req != null : "Missed message [rcvCnt=" + rcvCnt + ", acked=" + acked + ", desc=" + this + ']'; - if (fut.ackClosure() != null) - fut.ackClosure().apply(null); + if (req.ackClosure() != null) + req.ackClosure().apply(null); - fut.onAckReceived(); + req.onAckReceived(); acked++; } @@ -235,9 +235,9 @@ public class GridNioRecoveryDescriptor { } /** - * @return Message futures for unacknowledged messages. + * @return Requests for unacknowledged messages. */ - public Deque<SessionWriteRequest> messagesFutures() { + public Deque<SessionWriteRequest> messagesRequests() { return msgReqs; } http://git-wip-us.apache.org/repos/asf/ignite/blob/cf32e459/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 281d985..45f5f8c 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 @@ -549,8 +549,8 @@ public class GridNioServer<T> { GridNioRecoveryDescriptor recoveryDesc = ses.outRecoveryDescriptor(); - if (recoveryDesc != null && !recoveryDesc.messagesFutures().isEmpty()) { - Deque<SessionWriteRequest> futs = recoveryDesc.messagesFutures(); + if (recoveryDesc != null && !recoveryDesc.messagesRequests().isEmpty()) { + Deque<SessionWriteRequest> futs = recoveryDesc.messagesRequests(); if (log.isDebugEnabled()) log.debug("Resend messages [rmtNode=" + recoveryDesc.node().id() + ", msgCnt=" + futs.size() + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/cf32e459/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java index 245d5b9..e578035 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java @@ -234,7 +234,7 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl { if (log.isDebugEnabled()) log.debug("Unacknowledged messages queue size overflow, will attempt to reconnect " + "[remoteAddr=" + remoteAddress() + - ", queueSize=" + outRecovery.messagesFutures().size() + + ", queueSize=" + outRecovery.messagesRequests().size() + ", queueLimit=" + outRecovery.queueLimit() + ']'); close(); http://git-wip-us.apache.org/repos/asf/ignite/blob/cf32e459/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 294dcc0..c7baaea 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 @@ -391,7 +391,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter if (outDesc != null) { if (outDesc.nodeAlive(getSpiContext().node(id))) { - if (!outDesc.messagesFutures().isEmpty()) { + if (!outDesc.messagesRequests().isEmpty()) { if (log.isDebugEnabled()) log.debug("Session was closed but there are unacknowledged messages, " + "will try to reconnect [rmtNode=" + outDesc.node().id() + ']'); @@ -3554,7 +3554,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter if (recovery != null && recovery.nodeAlive(getSpiContext().node(nodeId)) && - !recovery.messagesFutures().isEmpty()) { + !recovery.messagesRequests().isEmpty()) { if (log.isDebugEnabled()) log.debug("Node connection is idle, but there are unacknowledged messages, " + "will wait: " + nodeId); http://git-wip-us.apache.org/repos/asf/ignite/blob/cf32e459/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java index 74be68d..63e832b 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java @@ -375,12 +375,12 @@ public class GridTcpCommunicationSpiMultithreadedSelfTest extends GridSpiAbstrac if (snd != null) { GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - return snd.messagesFutures().isEmpty(); + return snd.messagesRequests().isEmpty(); } }, 10_000); - assertEquals("Unexpected messages: " + snd.messagesFutures(), 0, - snd.messagesFutures().size()); + assertEquals("Unexpected messages: " + snd.messagesRequests(), 0, + snd.messagesRequests().size()); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/cf32e459/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java index e0478da..12c2edb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java @@ -188,12 +188,12 @@ public class GridTcpCommunicationSpiRecoveryAckSelfTest<T extends CommunicationS GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - return recoveryDesc.messagesFutures().isEmpty(); + return recoveryDesc.messagesRequests().isEmpty(); } }, 10_000); - assertEquals("Unexpected messages: " + recoveryDesc.messagesFutures(), 0, - recoveryDesc.messagesFutures().size()); + assertEquals("Unexpected messages: " + recoveryDesc.messagesRequests(), 0, + recoveryDesc.messagesRequests().size()); break; } http://git-wip-us.apache.org/repos/asf/ignite/blob/cf32e459/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java index 9928d93..c4930a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java @@ -202,12 +202,12 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTest<T extends Communic GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { - return recoveryDesc.messagesFutures().isEmpty(); + return recoveryDesc.messagesRequests().isEmpty(); } }, 10_000); - assertEquals("Unexpected messages: " + recoveryDesc.messagesFutures(), 0, - recoveryDesc.messagesFutures().size()); + assertEquals("Unexpected messages: " + recoveryDesc.messagesRequests(), 0, + recoveryDesc.messagesRequests().size()); break; }
