Repository: ignite Updated Branches: refs/heads/ignite-comm-opts2 41665bab0 -> 0b8c2bd77
nio balance Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b8c2bd7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b8c2bd7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b8c2bd7 Branch: refs/heads/ignite-comm-opts2 Commit: 0b8c2bd77fe4b4d6384355707cc08e8ddf67e76b Parents: 41665ba Author: sboikov <sboi...@gridgain.com> Authored: Thu Sep 15 15:19:35 2016 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Sep 15 15:19:35 2016 +0300 ---------------------------------------------------------------------- ...GridTcpCommunicationSpiRecoverySelfTest.java | 31 ++++++++++++-------- 1 file changed, 19 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0b8c2bd7/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java index 94dc665..bec6e00 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiRecoverySelfTest.java @@ -54,6 +54,7 @@ import org.eclipse.jetty.util.ConcurrentHashSet; /** * */ +@SuppressWarnings("unchecked") @GridSpiTest(spi = TcpCommunicationSpi.class, group = "Communication SPI") public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> extends GridSpiAbstractTest<T> { /** */ @@ -300,14 +301,14 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> log.info("Iteration: " + i); try { - final GridNioSession ses0 = communicationSession(spi0); - final GridNioSession ses1 = communicationSession(spi1); + final GridNioSession ses0 = communicationSession(spi0, false); + final GridNioSession ses1 = communicationSession(spi1, true); ses1.pauseReads().get(); IgniteInternalFuture<?> sndFut = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { - for (int i = 0; i < 5000; i++) { + for (int i = 0; i < 6000; i++) { spi0.sendMessage(node1, new GridTestMessage(node0.id(), msgId.incrementAndGet(), 0)); sentCnt.incrementAndGet(); @@ -410,14 +411,14 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> log.info("Iteration: " + i); try { - final GridNioSession ses0 = communicationSession(spi0); - final GridNioSession ses1 = communicationSession(spi1); + final GridNioSession ses0 = communicationSession(spi0, false); + final GridNioSession ses1 = communicationSession(spi1, true); ses1.pauseReads().get(); IgniteInternalFuture<?> sndFut = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { - for (int i = 0; i < 5000; i++) { + for (int i = 0; i < 6000; i++) { spi0.sendMessage(node1, new GridTestMessage(node0.id(), msgId.incrementAndGet(), 0)); expCnt1.incrementAndGet(); @@ -527,14 +528,14 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> log.info("Iteration: " + i); try { - final GridNioSession ses0 = communicationSession(spi0); - final GridNioSession ses1 = communicationSession(spi1); + final GridNioSession ses0 = communicationSession(spi0, false); + final GridNioSession ses1 = communicationSession(spi1, true); ses1.pauseReads().get(); IgniteInternalFuture<?> sndFut = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { - for (int i = 0; i < 5000; i++) { + for (int i = 0; i < 6000; i++) { spi0.sendMessage(node1, new GridTestMessage(node0.id(), msgId.incrementAndGet(), 0)); sentCnt.incrementAndGet(); @@ -600,11 +601,12 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> /** * @param spi SPI. + * @param in {@code True} if need find inbound session. * @return Session. * @throws Exception If failed. */ @SuppressWarnings("unchecked") - private GridNioSession communicationSession(TcpCommunicationSpi spi) throws Exception { + private GridNioSession communicationSession(TcpCommunicationSpi spi, boolean in) throws Exception { final GridNioServer srv = U.field(spi, "nioSrvr"); GridTestUtils.waitForCondition(new GridAbsPredicate() { @@ -617,9 +619,14 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> Collection<? extends GridNioSession> sessions = GridTestUtils.getFieldValue(srv, "sessions"); - assertEquals(1, sessions.size()); + for (GridNioSession ses : sessions) { + if (in == ses.accepted()) + return ses; + } + + fail("Failed to find session"); - return sessions.iterator().next(); + return null; } /**