ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/2] incubator-ignite git commit: # ignite-157-debug
Date Mon, 27 Apr 2015 14:07:50 GMT
# ignite-157-debug


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

Branch: refs/heads/ignite-157-debug
Commit: a9386b75a09cda50af7d15870bde7332f5550136
Parents: d14a0fb
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Apr 27 17:07:19 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Apr 27 17:07:19 2015 +0300

----------------------------------------------------------------------
 .../near/GridNearTxPrepareFuture.java           |  3 +-
 .../GridCacheAbstractFailoverTxSelfTest.java    | 42 --------------------
 .../IgniteCacheFailoverTestSuite.java           | 27 ++-----------
 3 files changed, 5 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9386b75/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
index f573187..eb33d95 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
@@ -860,7 +860,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
 
     /** {@inheritDoc} */
     @Override public String toString() {
-        return S.toString(GridNearTxPrepareFuture.class, this, super.toString());
+        return S.toString(GridNearTxPrepareFuture.class, this, "futs", futures().toString(),
"super", super.toString());
     }
 
     /**
@@ -995,6 +995,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
                             }
                             catch (GridCacheEntryRemovedException ignored) {
                                 // Retry.
+                                log.info("Removed: " + ignored);
                             }
                             catch (IgniteCheckedException e) {
                                 // Fail the whole compound future.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9386b75/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverTxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverTxSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverTxSelfTest.java
index fb8ac74..45a58de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverTxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverTxSelfTest.java
@@ -48,27 +48,6 @@ public abstract class GridCacheAbstractFailoverTxSelfTest extends GridCacheAbstr
     /**
      * @throws Exception If failed.
      */
-    public void testPessimisticReadCommittedTxConstantTopologyChange() throws Exception {
-        testConstantTopologyChange(PESSIMISTIC, READ_COMMITTED);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testPessimisticRepeatableReadTxConstantTopologyChange() throws Exception
{
-        testConstantTopologyChange(PESSIMISTIC, REPEATABLE_READ);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testPessimisticSerializableTxConstantTopologyChange() throws Exception {
-        testConstantTopologyChange(PESSIMISTIC, SERIALIZABLE);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
     public void testOptimisticReadCommittedTxTopologyChange() throws Exception {
         testTopologyChange(OPTIMISTIC, READ_COMMITTED);
     }
@@ -86,25 +65,4 @@ public abstract class GridCacheAbstractFailoverTxSelfTest extends GridCacheAbstr
     public void testOptimisticSerializableTxTopologyChange() throws Exception {
         testTopologyChange(OPTIMISTIC, SERIALIZABLE);
     }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testPessimisticReadCommittedTxTopologyChange() throws Exception {
-        testTopologyChange(PESSIMISTIC, READ_COMMITTED);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testPessimisticRepeatableReadTxTopologyChange() throws Exception {
-        testTopologyChange(PESSIMISTIC, REPEATABLE_READ);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testPessimisticSerializableTxTopologyChange() throws Exception {
-        testTopologyChange(PESSIMISTIC, SERIALIZABLE);
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9386b75/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
index 2acd6a3..1dbea90 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
@@ -36,34 +36,13 @@ public class IgniteCacheFailoverTestSuite extends TestSuite {
     public static TestSuite suite() throws Exception {
         TestSuite suite = new TestSuite("Cache Failover Test Suite");
 
-        suite.addTestSuite(GridCacheAtomicInvalidPartitionHandlingSelfTest.class);
-
-        suite.addTestSuite(GridCacheIncrementTransformTest.class);
-
-        // Failure consistency tests.
-        suite.addTestSuite(GridCacheAtomicRemoveFailureTest.class);
-        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderRemoveFailureTest.class);
-
-        suite.addTestSuite(GridCacheDhtAtomicRemoveFailureTest.class);
-        suite.addTestSuite(GridCacheDhtRemoveFailureTest.class);
-        suite.addTestSuite(GridCacheNearRemoveFailureTest.class);
-        suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
-        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.class);
-
-        suite.addTestSuite(GridCacheAtomicFailoverSelfTest.class);
-        suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.class);
-        suite.addTestSuite(GridCacheAtomicReplicatedFailoverSelfTest.class);
-
         suite.addTestSuite(GridCachePartitionedFailoverSelfTest.class);
         suite.addTestSuite(GridCacheColocatedFailoverSelfTest.class);
         suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class);
 
-        suite.addTestSuite(IgniteCacheAtomicNodeJoinTest.class);
-        suite.addTestSuite(IgniteCacheTxNodeJoinTest.class);
-        suite.addTestSuite(IgniteCacheTxFairAffinityNodeJoinTest.class);
-
-        suite.addTestSuite(IgniteCacheTxNearDisabledPutGetRestartTest.class);
-        suite.addTestSuite(IgniteCacheTxNearDisabledFairAffinityPutGetRestartTest.class);
+        suite.addTestSuite(GridCachePartitionedFailoverSelfTest.class);
+        suite.addTestSuite(GridCacheColocatedFailoverSelfTest.class);
+        suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class);
 
         return suite;
     }


Mime
View raw message