Repository: ignite Updated Branches: refs/heads/ignite-zk 391ec5b55 -> 646be0a51
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/646be0a5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/646be0a5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/646be0a5 Branch: refs/heads/ignite-zk Commit: 646be0a51912e1ce810cc997ab6349af73dbc410 Parents: 391ec5b Author: sboikov <[email protected]> Authored: Wed Dec 20 17:47:30 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Dec 20 17:53:40 2017 +0300 ---------------------------------------------------------------------- .../cache/binary/BinaryMetadataTransport.java | 2 +- .../IgniteClientReconnectBinaryContexTest.java | 2 +- .../ClientReconnectContinuousQueryTest.java | 19 ++++++++++++++----- 3 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/646be0a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java index a272304..de8031c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java @@ -172,7 +172,7 @@ final class BinaryMetadataTransport { } } catch (Exception e) { - resFut.onDone(e); + resFut.onDone(MetadataUpdateResult.createUpdateDisabledResult(), e); } if (ctx.clientDisconnected()) http://git-wip-us.apache.org/repos/asf/ignite/blob/646be0a5/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectBinaryContexTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectBinaryContexTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectBinaryContexTest.java index d4841b6..a9052a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectBinaryContexTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectBinaryContexTest.java @@ -80,7 +80,7 @@ public class IgniteClientReconnectBinaryContexTest extends IgniteClientReconnect else { reconnectClients(log, Collections.singletonList(client), new Runnable() { @Override public void run() { - stopGrid(0); + stopGrid(0, false); try { startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/646be0a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java index c8b3bb6..9b531c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.cache.query.continuous; +import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javax.cache.event.CacheEntryListenerException; @@ -28,6 +29,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.Event; import org.apache.ignite.events.EventType; import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.managers.communication.GridIoManager; import org.apache.ignite.internal.util.nio.GridNioServer; import org.apache.ignite.internal.util.typedef.internal.U; @@ -90,7 +92,7 @@ public class ClientReconnectContinuousQueryTest extends GridCommonAbstractTest { try { startGrids(2); - IgniteEx client = grid(CLIENT_IDX); + final IgniteEx client = grid(CLIENT_IDX); client.events().localListen(new DisconnectListener(), EventType.EVT_CLIENT_NODE_DISCONNECTED); @@ -112,11 +114,19 @@ public class ClientReconnectContinuousQueryTest extends GridCommonAbstractTest { skipRead(client, true); - putSomeKeys(1_000); + IgniteInternalFuture<?> fut = GridTestUtils.runAsync(new Callable<Void>() { + @Override public Void call() throws Exception { + assertTrue(disconLatch.await(10_000, TimeUnit.MILLISECONDS)); + + skipRead(client, false); - assertTrue(disconLatch.await(10_000, TimeUnit.MILLISECONDS)); + return null; + } + }); - skipRead(client, false); + putSomeKeys(1_000); + + fut.get(); assertTrue(reconLatch.await(10_000, TimeUnit.MILLISECONDS)); @@ -129,7 +139,6 @@ public class ClientReconnectContinuousQueryTest extends GridCommonAbstractTest { finally { stopAllGrids(); } - } /**
