Repository: ignite Updated Branches: refs/heads/ignite-1564 a3c2ddb3f -> d439a529a
ignite-1564 Fixed client reconnect issues Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d439a529 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d439a529 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d439a529 Branch: refs/heads/ignite-1564 Commit: d439a529a9f3f895c74b901a7a16b6ccd7c19911 Parents: a3c2ddb Author: sboikov <sboi...@gridgain.com> Authored: Tue Sep 29 17:06:56 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Sep 29 17:06:56 2015 +0300 ---------------------------------------------------------------------- .../IgniteClientReconnectCacheTest.java | 51 +++++++++++++------- 1 file changed, 34 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d439a529/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java index f3f45e9..edd95e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java @@ -1077,36 +1077,53 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac clients.add(client); } - reconnectClientNodes(clients, grid(0), null); + int nodes = SRV_CNT + CLIENTS; + int srvNodes = SRV_CNT; - for (Ignite client : clients) { - IgniteCache<Object, Object> cache = client.cache(null); + for (int iter = 0; iter < 3; iter++) { + log.info("Iteration: " + iter); - assertNotNull(cache); + reconnectClientNodes(clients, grid(0), null); - cache.put(client.name(), 1); + for (Ignite client : clients) { + IgniteCache<Object, Object> cache = client.cache(null); - assertEquals(1, cache.get(client.name())); + assertNotNull(cache); - ClusterGroup grp = client.cluster().forCacheNodes(null); + cache.put(client.name(), 1); - assertEquals(CLIENTS + SRV_CNT, grp.nodes().size()); + assertEquals(1, cache.get(client.name())); - grp = client.cluster().forClientNodes(null); + ClusterGroup grp = client.cluster().forCacheNodes(null); - assertEquals(CLIENTS, grp.nodes().size()); - } + assertEquals(CLIENTS + srvNodes, grp.nodes().size()); - for (int i = 0; i < SRV_CNT; i++) { - Ignite ignite = grid(i); + grp = client.cluster().forClientNodes(null); - ClusterGroup grp = ignite.cluster().forCacheNodes(null); + assertEquals(CLIENTS, grp.nodes().size()); + } - assertEquals(CLIENTS + SRV_CNT, grp.nodes().size()); + for (int i = 0; i < nodes; i++) { + Ignite ignite = grid(i); - grp = ignite.cluster().forClientNodes(null); + ClusterGroup grp = ignite.cluster().forCacheNodes(null); + + assertEquals(CLIENTS + srvNodes, grp.nodes().size()); + + grp = ignite.cluster().forClientNodes(null); + + assertEquals(CLIENTS, grp.nodes().size()); + } + + clientMode = false; + + startGrid(nodes++); + + srvNodes++; + + clientMode = true; - assertEquals(CLIENTS, grp.nodes().size()); + startGrid(nodes++); } }
