ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dma...@apache.org
Subject [28/28] ignite git commit: IGNITE-801: final improvements
Date Tue, 17 Nov 2015 11:58:02 GMT
IGNITE-801: final improvements


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b74a26a9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b74a26a9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b74a26a9

Branch: refs/heads/ignite-801
Commit: b74a26a9ac65a6680f46aa10f3e5ae34eca9fdb5
Parents: f919c7a
Author: Denis Magda <dmagda@gridgain.com>
Authored: Tue Nov 17 14:56:45 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Tue Nov 17 14:56:45 2015 +0300

----------------------------------------------------------------------
 ...eAbstractDataStructuresFailoverSelfTest.java | 31 +++-----------------
 1 file changed, 4 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b74a26a9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
index 086a29d..80e151c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java
@@ -57,7 +57,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
  */
 public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends IgniteCollectionAbstractTest
{
     /** */
-    private static final long TEST_TIMEOUT = 2 * 60 * 1000;
+    private static final long TEST_TIMEOUT = 3 * 60 * 1000;
 
     /** */
     private static final String NEW_GRID_NAME = "newGrid";
@@ -667,8 +667,6 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest
extends Ig
          * @return Future.
          */
         IgniteInternalFuture<?> startChangingTopology(final IgniteClosure<Ignite,
?> callback) {
-            final boolean partitioned = collectionCacheMode() == CacheMode.PARTITIONED;
-
             IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA()
{
                 @Override public void apply() {
                     try {
@@ -684,21 +682,8 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest
extends Ig
                                 callback.apply(g);
                             }
                             finally {
-                                if (i != TOP_CHANGE_CNT - 1) {
-                                    stopGrid(name, !partitioned);
-
-                                    if (partitioned) {
-                                        while (true) {
-                                            try {
-                                                awaitPartitionMapExchange();
-
-                                                break;
-                                            } catch(Exception ex){
-                                                U.error(log, ex.getMessage());
-                                            }
-                                        }
-                                    }
-                                }
+                                if (i != TOP_CHANGE_CNT - 1)
+                                    stopGrid(name);
                             }
                         }
                     }
@@ -790,15 +775,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest
extends Ig
                         for (String name : startedNodes) {
                             stopGrid(name, false);
 
-                            while (true) {
-                                try {
-                                    awaitPartitionMapExchange();
-
-                                    break;
-                                } catch(Exception ex){
-                                    U.error(log, ex.getMessage());
-                                }
-                            }
+                            awaitPartitionMapExchange();
                         }
 
                         startedNodes.clear();


Mime
View raw message