ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/3] ignite git commit: ignite-5578
Date Thu, 03 Aug 2017 11:22:47 GMT
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 <sboikov@gridgain.com>
Authored: Thu Aug 3 14:09:23 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
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<Object>() {
@@ -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<Object>() {
@@ -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


Mime
View raw message