Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9AD32200CED for ; Thu, 3 Aug 2017 13:22:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9972116B5E1; Thu, 3 Aug 2017 11:22:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E755A16B5DF for ; Thu, 3 Aug 2017 13:22:49 +0200 (CEST) Received: (qmail 11738 invoked by uid 500); 3 Aug 2017 11:22:49 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 11726 invoked by uid 99); 3 Aug 2017 11:22:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Aug 2017 11:22:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B71FBF323C; Thu, 3 Aug 2017 11:22:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Thu, 03 Aug 2017 11:22:47 -0000 Message-Id: <0b4120e1dc694f17ab60eadb663ca2f5@git.apache.org> In-Reply-To: <78543edd67cf49e29c169c8e7c6ee401@git.apache.org> References: <78543edd67cf49e29c169c8e7c6ee401@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] ignite git commit: ignite-5578 archived-at: Thu, 03 Aug 2017 11:22:50 -0000 ignite-5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1579ea1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1579ea1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1579ea1 Branch: refs/heads/ignite-5578-1 Commit: b1579ea1b1980e4cdf4fe378f21013336063909e Parents: 6b6ab17 Author: sboikov Authored: Thu Aug 3 14:09:23 2017 +0300 Committer: sboikov Committed: Thu Aug 3 14:09:23 2017 +0300 ---------------------------------------------------------------------- .../cache/IgniteDynamicCacheStartSelfTest.java | 21 ++++++-------------- 1 file changed, 6 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b1579ea1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java index 05dbce0..8f601f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java @@ -324,9 +324,6 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { for (int g = 0; g < nodeCount(); g++) { IgniteEx kernal0 = grid(g); - for (IgniteInternalFuture f : kernal0.context().cache().context().exchange().exchangeFutures()) - f.get(); - info("Getting cache for node: " + g); assertNotNull(grid(g).cache(DYNAMIC_CACHE_NAME)); @@ -345,14 +342,13 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { kernal.destroyCache(DYNAMIC_CACHE_NAME); + awaitPartitionMapExchange(); + for (int g = 0; g < nodeCount(); g++) { final IgniteKernal kernal0 = (IgniteKernal)grid(g); final int idx = g; - for (IgniteInternalFuture f : kernal0.context().cache().context().exchange().exchangeFutures()) - f.get(); - assertNull(kernal0.cache(DYNAMIC_CACHE_NAME)); GridTestUtils.assertThrows(log, new Callable() { @@ -387,9 +383,6 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { for (int g = 0; g < nodeCount(); g++) { IgniteEx kernal0 = grid(g); - for (IgniteInternalFuture f : kernal0.context().cache().context().exchange().exchangeFutures()) - f.get(); - info("Getting cache for node: " + g); for (int i = 0; i < cacheCnt; i++) @@ -423,6 +416,8 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { kernal.destroyCaches(namesToDestroy); + awaitPartitionMapExchange(); + for (int g = 0; g < nodeCount(); g++) { final IgniteKernal kernal0 = (IgniteKernal)grid(g); @@ -430,9 +425,6 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { final int idx = g * nodeCount() + i; final int expVal = i; - for (IgniteInternalFuture f : kernal0.context().cache().context().exchange().exchangeFutures()) - f.get(); - assertNull(kernal0.cache(DYNAMIC_CACHE_NAME)); GridTestUtils.assertThrows(log, new Callable() { @@ -536,13 +528,12 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { } } + awaitPartitionMapExchange(); + // Check that cache is not deployed on new node after undeploy. for (int g = 0; g < nodeCount() + 2; g++) { final IgniteKernal kernal0 = (IgniteKernal)grid(g); - for (IgniteInternalFuture f : kernal0.context().cache().context().exchange().exchangeFutures()) - f.get(); - if (g < nodeCount()) assertNotNull(grid(g).cache(DYNAMIC_CACHE_NAME)); else