ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: # ignite-648: move killall place
Date Mon, 29 Jun 2015 16:05:07 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-648-failover aeeda5831 -> bd2c258e3


# ignite-648: move killall place


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

Branch: refs/heads/ignite-648-failover
Commit: bd2c258e3317a4e8857877c6d83234ca9982dc9b
Parents: aeeda58
Author: ashutak <ashutak@gridgain.com>
Authored: Mon Jun 29 19:05:54 2015 +0300
Committer: ashutak <ashutak@gridgain.com>
Committed: Mon Jun 29 19:05:54 2015 +0300

----------------------------------------------------------------------
 .../testframework/junits/GridAbstractTest.java       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd2c258e/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 03a3c35..5252c76 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -775,9 +775,6 @@ public abstract class GridAbstractTest extends TestCase {
      * @param cancel Cancel flag.
      */
     protected void stopAllGrids(boolean cancel) {
-        IgniteProcessProxy.killAll(); // In multi jvm case.
-        IgniteNodeRunner.killAll();
-
         Collection<Ignite> clients = new ArrayList<>();
         Collection<Ignite> srvs = new ArrayList<>();
 
@@ -794,6 +791,18 @@ public abstract class GridAbstractTest extends TestCase {
         for (Ignite g : srvs)
             stopGrid(g.name(), cancel);
 
+        if (isMultiJvm()) {
+//            IgniteProcessProxy.killAll(); // In multi jvm case.
+            try {
+                Thread.sleep(1_000);
+            }
+            catch (InterruptedException e) {
+                e.printStackTrace(); // TODO implement.
+            }
+
+            IgniteNodeRunner.killAll();
+        }
+
         assert G.allGrids().isEmpty();
     }
 


Mime
View raw message