#sprint-1: GridServiceReassignmentSelfTest delay more 500.

apache · Feb 9, 2015 · 148753c · 148753c
1 parent 2e8ff3d
commit 148753c
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/...t/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java b/...t/java/org/apache/ignite/internal/processors/service/GridServiceReassignmentSelfTest.java
@@ -122,9 +122,12 @@ private void checkReassigns(int total, int maxPerNode) throws Exception {
                         grow = true;
                 }
 
-                U.sleep(2000);
+                for (int attempt = 0; attempt <= 10; ++attempt) {
+                    U.sleep(500);
 
-                checkServices(total, maxPerNode, F.first(startedGrids));
+                    if (checkServices(total, maxPerNode, F.first(startedGrids), attempt == 10))
+                        break;
+                }
             }
         }
         finally {
@@ -144,7 +147,7 @@ private void checkReassigns(int total, int maxPerNode) throws Exception {
      * @param gridIdx Grid index to check.
      * @throws Exception If failed.
      */
-    private void checkServices(int total, int maxPerNode, int gridIdx) throws Exception {
+    private boolean checkServices(int total, int maxPerNode, int gridIdx, boolean lastTry) throws Exception {
         IgniteEx grid = grid(gridIdx);
 
         GridCacheProjectionEx<GridServiceAssignmentsKey, GridServiceAssignments> cache = grid.
@@ -161,6 +164,9 @@ private void checkServices(int total, int maxPerNode, int gridIdx) throws Except
         for (Map.Entry<UUID, Integer> entry : assignments.assigns().entrySet()) {
             UUID nodeId = entry.getKey();
 
+            if (!lastTry && !nodes.contains(nodeId))
+                return false;
+
             assertTrue("Dead node is in assignments: " + nodeId, nodes.contains(nodeId));
 
             Integer nodeCnt = entry.getValue();
@@ -176,7 +182,12 @@ private void checkServices(int total, int maxPerNode, int gridIdx) throws Except
             assertTrue("Total number of services limit exceeded [sum=" + sum +
                 ", assigns=" + assignments.assigns() + ']', sum <= total);
 
+        if (!lastTry && proxy(grid).get() != 10)
+            return false;
+
         assertEquals(10, proxy(grid).get());
+
+        return true;
     }
 
     /**