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: additional killing
Date Wed, 01 Jul 2015 12:58:28 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-648-failover 3f5ca4c37 -> 931cea265


# ignite-648: additional killing


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

Branch: refs/heads/ignite-648-failover
Commit: 931cea2652e8c8d27e6b058509e16577621e4bc5
Parents: 3f5ca4c
Author: ashutak <ashutak@gridgain.com>
Authored: Wed Jul 1 15:59:22 2015 +0300
Committer: ashutak <ashutak@gridgain.com>
Committed: Wed Jul 1 15:59:22 2015 +0300

----------------------------------------------------------------------
 .../junits/multijvm/IgniteNodeRunner.java       | 12 +++++--
 .../IgniteCacheFailoverMJTestSuite.java         | 37 +++++++++-----------
 2 files changed, 26 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/931cea26/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
index 24a6618..150070a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
@@ -129,6 +129,12 @@ public class IgniteNodeRunner {
     public static List<Integer> killAll() {
         jps();
 
+        X.println(">>>>> IgniteProcessProxy.killAll()");
+
+        IgniteProcessProxy.killAll();
+
+        jps();
+
         List<Integer> res = new ArrayList<>();
 
         try {
@@ -199,17 +205,17 @@ public class IgniteNodeRunner {
 
                     String name = MonitoredVmUtil.mainClass(vm, false);
 
-                    X.println(">>>>> " + jvmId + ' ' + name);
+                    X.println(">>>>>>>> " + jvmId + ' ' + name);
                 }
                 catch (Exception ignore) {
                     // Print stack trace just for information.
-                    X.printerr(">>>>> " + jvmId + " Could not get process
information.");
+                    X.printerrln(">>>>>>>> " + jvmId + " Could not
get process information.");
                 }
             }
         }
         catch (Exception e) {
             // Print stack trace just for information.
-            X.printerrln(">>>>> Could not print java processes.", e);
+            X.printerrln(">>>>>>>> Could not print java processes.",
e);
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/931cea26/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverMJTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverMJTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverMJTestSuite.java
index b6d60e7..6ffaa8a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverMJTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverMJTestSuite.java
@@ -18,10 +18,7 @@
 package org.apache.ignite.testsuites;
 
 import junit.framework.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.*;
 import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
-import org.apache.ignite.internal.processors.cache.distributed.near.*;
-import org.apache.ignite.internal.processors.cache.distributed.replicated.*;
 
 /**
  * Test suite.
@@ -37,23 +34,23 @@ public class IgniteCacheFailoverMJTestSuite extends TestSuite {
         // Failure consistency tests.
         suite.addTestSuite(GridCacheAtomicRemoveFailureMJTest.class);
         suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderRemoveFailureMJTest.class);
-        suite.addTestSuite(GridCacheAtomicClientRemoveFailureMJTest.class);
-
-        suite.addTestSuite(GridCacheDhtAtomicRemoveFailureMJTest.class);
-        suite.addTestSuite(GridCacheDhtRemoveFailureMJTest.class);
-        suite.addTestSuite(GridCacheDhtClientRemoveFailureMJTest.class);
-        suite.addTestSuite(GridCacheNearRemoveFailureMJTest.class);
-        suite.addTestSuite(GridCacheAtomicNearRemoveFailureMJTest.class);
-        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNearRemoveFailureMJTest.class);
-
-        // From part 2
-        suite.addTestSuite(GridCacheAtomicFailoverSelfMJTest.class);
-        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFailoverSelfMJTest.class);
-        suite.addTestSuite(GridCacheAtomicReplicatedFailoverSelfMJTest.class);
-
-        suite.addTestSuite(GridCachePartitionedFailoverSelfMJTest.class);
-        suite.addTestSuite(GridCacheColocatedFailoverSelfMJTest.class);
-        suite.addTestSuite(GridCacheReplicatedFailoverSelfMJTest.class);
+//        suite.addTestSuite(GridCacheAtomicClientRemoveFailureMJTest.class);
+//
+//        suite.addTestSuite(GridCacheDhtAtomicRemoveFailureMJTest.class);
+//        suite.addTestSuite(GridCacheDhtRemoveFailureMJTest.class);
+//        suite.addTestSuite(GridCacheDhtClientRemoveFailureMJTest.class);
+//        suite.addTestSuite(GridCacheNearRemoveFailureMJTest.class);
+//        suite.addTestSuite(GridCacheAtomicNearRemoveFailureMJTest.class);
+//        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNearRemoveFailureMJTest.class);
+//
+//        // From part 2
+//        suite.addTestSuite(GridCacheAtomicFailoverSelfMJTest.class);
+//        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFailoverSelfMJTest.class);
+//        suite.addTestSuite(GridCacheAtomicReplicatedFailoverSelfMJTest.class);
+//
+//        suite.addTestSuite(GridCachePartitionedFailoverSelfMJTest.class);
+//        suite.addTestSuite(GridCacheColocatedFailoverSelfMJTest.class);
+//        suite.addTestSuite(GridCacheReplicatedFailoverSelfMJTest.class);
 
         return suite;
     }


Mime
View raw message