ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-4705
Date Thu, 09 Mar 2017 09:46:58 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-4705-2 10b2e143f -> 36610b55d


ignite-4705


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

Branch: refs/heads/ignite-4705-2
Commit: 36610b55ddf336fe6a4866c5c02a3c282af1e078
Parents: 10b2e14
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Mar 9 12:44:00 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Mar 9 12:45:31 2017 +0300

----------------------------------------------------------------------
 .../atomic/IgniteCacheAtomicProtocolTest.java   | 67 +++++++++++++-------
 1 file changed, 45 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/36610b55/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
index 3b1b7f5..6d90d0e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/IgniteCacheAtomicProtocolTest.java
@@ -473,13 +473,6 @@ public class IgniteCacheAtomicProtocolTest extends GridCommonAbstractTest
{
     /**
      * @throws Exception If failed.
      */
-    public void testPutAllRemapAndPrimaryFailed() throws Exception {
-        // TODO IGNITE-4705.
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
     public void testPutNearNodeFailure() throws Exception {
         startGrids(2);
 
@@ -579,26 +572,59 @@ public class IgniteCacheAtomicProtocolTest extends GridCommonAbstractTest
{
     /**
      * @throws Exception If failed.
      */
-    public void testCacheOperations() throws Exception {
-        cacheOperations();
+    public void testCacheOperations0() throws Exception {
+        cacheOperations(0);
     }
 
     /**
      * @throws Exception If failed.
      */
-    public void testCacheOperations_UnstableTopology() throws Exception {
+    public void testCacheOperations_UnstableTopology0() throws Exception {
         blockRebalance = true;
 
-        cacheOperations();
+        cacheOperations(0);
     }
 
     /**
      * @throws Exception If failed.
      */
-    private void cacheOperations() throws Exception {
-        ccfg = cacheConfiguration(1, FULL_SYNC);
+    public void testCacheOperations1() throws Exception {
+        cacheOperations(1);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheOperations_UnstableTopology1() throws Exception {
+        blockRebalance = true;
+
+        cacheOperations(1);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheOperations2() throws Exception {
+        cacheOperations(2);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheOperations_UnstableTopology2() throws Exception {
+        blockRebalance = true;
+
+        cacheOperations(2);
+    }
+
+    /**
+     * @param backups Number of backups.
+     * @throws Exception If failed.
+     */
+    private void cacheOperations(int backups) throws Exception {
+        ccfg = cacheConfiguration(backups, FULL_SYNC);
 
-        final int SRVS = 2;
+        final int SRVS = 4;
 
         startServers(SRVS);
 
@@ -640,13 +666,6 @@ public class IgniteCacheAtomicProtocolTest extends GridCommonAbstractTest
{
     /**
      * @throws Exception If failed.
      */
-    public void testRemoveAll() throws Exception {
-        // TODO IGNITE-4705 (some keys exist, some not).
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
     public void testPutMissedDhtRequest_UnstableTopology() throws Exception {
         blockRebalance = true;
 
@@ -824,6 +843,10 @@ public class IgniteCacheAtomicProtocolTest extends GridCommonAbstractTest
{
         return ccfg;
     }
 
+    /**
+     * @param cnt Number of server nodes.
+     * @throws Exception If failed.
+     */
     private void startServers(int cnt) throws Exception {
         startGrids(cnt - 1);
 
@@ -845,7 +868,7 @@ public class IgniteCacheAtomicProtocolTest extends GridCommonAbstractTest
{
         /**
          * @param val Value.
          */
-        public SetValueEntryProcessor(Integer val) {
+        SetValueEntryProcessor(Integer val) {
             this.val = val;
         }
 


Mime
View raw message