# Merge remote-tracking branch 'remotes/origin/master' into ignite-21
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c67dcde9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c67dcde9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c67dcde9 Branch: refs/heads/ignite-1 Commit: c67dcde9f967349dec79b66bc19babb50e2d04f0 Parents: 4a73539 Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 12 11:14:01 2014 +0400 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 12 11:14:01 2014 +0400 ---------------------------------------------------------------------- .../spi/communication/tcp/TcpCommunicationSpi.java | 12 ++++++------ .../grid/util/nio/GridNioRecoveryDescriptor.java | 2 +- .../GridAbstractCommunicationSelfTest.java | 2 +- ...ridTcpCommunicationSpiConcurrentConnectSelfTest.java | 4 ++-- .../tcp/GridTcpCommunicationSpiRecoveryAckSelfTest.java | 6 +++--- .../tcp/GridTcpCommunicationSpiRecoverySelfTest.java | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c67dcde9/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 2c7f8be..9ba7c45 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 @@ -211,7 +211,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter public static final boolean DFLT_TCP_NODELAY = true; /** Default received messages threshold for sending ack. */ - public static final int DFLT_ACK_SND_THRESHOLD = 512; + public static final int DFLT_ACK_SND_THRESHOLD = 16; /** Default socket write timeout. */ public static final long DFLT_SOCK_WRITE_TIMEOUT = GridNioServer.DFLT_SES_WRITE_TIMEOUT; @@ -586,7 +586,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter fut.onDone(client); } - catch (GridException | IOException e) { + catch (IgniteCheckedException | IOException e) { if (log.isDebugEnabled()) log.debug("Failed to send recovery handshake " + "[rmtNode=" + rmtNode.id() + ", err=" + e + ']'); @@ -1780,7 +1780,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter ClusterNode node0 = getSpiContext().node(node.id()); if (node0 == null) - throw new GridException("Failed to send message to remote node " + + throw new IgniteCheckedException("Failed to send message to remote node " + "(node has left the grid): " + node.id()); } } @@ -2199,7 +2199,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter * @param recovery Recovery descriptor if use recovery handshake, otherwise {@code null}. * @param rmtNodeId Remote node. * @param timeout Timeout for handshake. - * @throws GridException If handshake failed or wasn't completed withing timeout. + * @throws IgniteCheckedException If handshake failed or wasn't completed withing timeout. * @return Handshake response. */ @SuppressWarnings("ThrowFromFinallyBlock") @@ -2280,7 +2280,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter int read = ch.read(buf); if (read == -1) - throw new GridException("Failed to read remote node recovery handshake " + + throw new IgniteCheckedException("Failed to read remote node recovery handshake " + "(connection closed)."); i += read; @@ -2833,7 +2833,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter client.release(); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (recoveryDesc.nodeAlive(getSpiContext().node(node.id()))) { if (log.isDebugEnabled()) log.debug("Recovery reconnect failed, will retry " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c67dcde9/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioRecoveryDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioRecoveryDescriptor.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioRecoveryDescriptor.java index 846a388..6ed15a9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioRecoveryDescriptor.java +++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioRecoveryDescriptor.java @@ -170,7 +170,7 @@ public class GridNioRecoveryDescriptor { assert fut != null; - ((GridNioFutureImpl)fut).onDone(); + assert fut.isDone(); acked++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c67dcde9/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java index 07b5059..2e2355f 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridAbstractCommunicationSelfTest.java @@ -238,7 +238,7 @@ public abstract class GridAbstractCommunicationSelfTest<T extends CommunicationS break; } - catch (GridException e) { + catch (IgniteCheckedException e) { if (e.hasCause(BindException.class)) { if (i < 2) { info("Failed to start SPIs because of BindException, will retry after delay."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c67dcde9/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java index ffe5d57..8a28058 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiConcurrentConnectSelfTest.java @@ -9,11 +9,11 @@ package org.apache.ignite.spi.communication.tcp; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.communication.*; import org.eclipse.jetty.util.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.nio.*; @@ -361,7 +361,7 @@ public class GridTcpCommunicationSpiConcurrentConnectSelfTest<T extends Communic break; } - catch (GridException e) { + catch (IgniteCheckedException e) { if (e.hasCause(BindException.class)) { if (i < 2) { info("Failed to start SPIs because of BindException, will retry after delay."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c67dcde9/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 b20e50e..e9eef6a 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 @@ -9,11 +9,11 @@ package org.apache.ignite.spi.communication.tcp; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.communication.*; import org.eclipse.jetty.util.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.nio.*; @@ -201,7 +201,7 @@ public class GridTcpCommunicationSpiRecoveryAckSelfTest<T extends CommunicationS break; } - catch (GridException e) { + catch (IgniteCheckedException e) { if (e.hasCause(BindException.class)) { if (i < 2) { info("Got exception caused by BindException, will retry after delay: " + e); @@ -386,7 +386,7 @@ public class GridTcpCommunicationSpiRecoveryAckSelfTest<T extends CommunicationS break; } - catch (GridException e) { + catch (IgniteCheckedException e) { if (e.hasCause(BindException.class)) { if (i < 2) { info("Failed to start SPIs because of BindException, will retry after delay."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c67dcde9/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 fb1c29f..fadac25 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 @@ -9,12 +9,12 @@ package org.apache.ignite.spi.communication.tcp; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.communication.*; import org.eclipse.jetty.util.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.nio.*; @@ -314,7 +314,7 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> assertEquals(expMsgs, lsnr1.rcvCnt.get()); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (e.hasCause(BindException.class)) { errCnt++; @@ -436,7 +436,7 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> assertEquals(expMsgs0, lsnr0.rcvCnt.get()); assertEquals(expMsgs1, lsnr1.rcvCnt.get()); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (e.hasCause(BindException.class)) { errCnt++; @@ -535,7 +535,7 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> assertEquals(expMsgs, lsnr1.rcvCnt.get()); } - catch (GridException e) { + catch (IgniteCheckedException e) { if (e.hasCause(BindException.class)) { errCnt++; @@ -672,7 +672,7 @@ public class GridTcpCommunicationSpiRecoverySelfTest<T extends CommunicationSpi> break; } - catch (GridException e) { + catch (IgniteCheckedException e) { if (e.hasCause(BindException.class)) { if (i < 2) { info("Failed to start SPIs because of BindException, will retry after delay.");
