From 99a5e33e1d6cdc71e4f64d6d71d8f912d29df217 Mon Sep 17 00:00:00 2001 From: Fedotov Date: Wed, 27 Jun 2018 18:22:41 +0300 Subject: [PATCH 1/2] catch IgniteNeedReconnectException --- .../dht/IgniteAtomicLongChangingTopologySelfTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java index 40a89527bcffe..684495720057d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java @@ -32,12 +32,14 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteAtomicLong; import org.apache.ignite.IgniteClientDisconnectedException; +import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteQueue; import org.apache.ignite.IgniteSet; import org.apache.ignite.configuration.AtomicConfiguration; import org.apache.ignite.configuration.CollectionConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.IgniteNeedReconnectException; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; @@ -223,6 +225,13 @@ private void testFailoverWithClient(IgniteInClosure c) throws Exception catch (IgniteClientDisconnectedException e) { e.reconnectFuture().get(); } + catch (IgniteException e) { + if (e.hasCause(IgniteNeedReconnectException.class)) + U.sleep(100);//wait for reconnection to prevent exception on rollback transaction + else + throw e; + + } } finished.set(true); From 47b7a21e43b88c65aaeddf1003d92830a7bc2ed7 Mon Sep 17 00:00:00 2001 From: Fedotov Date: Fri, 29 Jun 2018 14:06:19 +0300 Subject: [PATCH 2/2] change EXECUTE_WAIT_TIME of ssh connection --- .../ignite/internal/util/nodestart/StartNodeCallableImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java index 1bf23b3414db8..0f912eb83eb68 100644 --- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java @@ -76,7 +76,7 @@ public class StartNodeCallableImpl implements StartNodeCallable { private static final String SUCCESSFUL_START_MSG = "Successfully bound to TCP port"; /** */ - private static final long EXECUTE_WAIT_TIME = 1000; + private static final long EXECUTE_WAIT_TIME = 2000; /** */ private static final long NODE_START_CHECK_PERIOD = 2000;