You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/26 19:08:06 UTC

[1/3] incubator-ignite git commit: IGNITE-929 IgniteCache.close should not delete the cache from the cluster

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-929 4b0659af8 -> 71b81e058


IGNITE-929
IgniteCache.close should not delete the cache from the cluster


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

Branch: refs/heads/ignite-929
Commit: a4c2851c7fba8089dd2e7cb0dce118add24e465a
Parents: 4b0659a
Author: avinogradov <av...@gridgain.com>
Authored: Fri May 22 18:09:43 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri May 22 18:09:43 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/CacheStopAndDestroySelfTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4c2851c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 82a5ec6..4e58c2a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -195,7 +195,7 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
 
         //Close:
 
-        //DHT Close. No-Op.
+        //DHT Close. No-op.
         grid(0).cache(CACHE_NAME_3).close();
 
         assert grid(0).cache(CACHE_NAME_3).get(KEY_VAL).equals(KEY_VAL);// Not affected.


[2/3] incubator-ignite git commit: Ignite-929

Posted by sb...@apache.org.
Ignite-929


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

Branch: refs/heads/ignite-929
Commit: 74420235783f96a7f2c0d51fd9a7db74a216c6ce
Parents: a4c2851
Author: avinogradov <av...@gridgain.com>
Authored: Tue May 26 20:07:43 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue May 26 20:07:43 2015 +0300

----------------------------------------------------------------------
 .../cache/CacheStopAndDestroySelfTest.java      | 282 +++++++++++++------
 1 file changed, 203 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74420235/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 4e58c2a..31e5d92 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -22,29 +22,35 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 /**
- * Check stop and remove methods behavior.
+ * Checks stop and destroy methods behavior.
  */
 public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
     /** key-value used at test. */
     protected static String KEY_VAL = "1";
 
     /** cache name 1. */
-    protected static String CACHE_NAME_1 = "cache1";
+    protected static String CACHE_NAME_DESTROY_DHT = "cache_d";
 
     /** cache name 2. */
-    protected static String CACHE_NAME_2 = "cache2";
+    protected static String CACHE_NAME_CLOSE_DHT = "cache_c";
 
     /** cache name 3. */
-    protected static String CACHE_NAME_3 = "cache3";
+    protected static String CACHE_NAME_DESTROY_CLIENT = "cache_d_client";
 
     /** cache name 4. */
-    protected static String CACHE_NAME_4 = "cache4";
+    protected static String CACHE_NAME_CLOSE_CLIENT = "cache_c_client";
+
+    /** near cache name 1. */
+    protected static String CACHE_NAME_DESTROY_NEAR = "cache_d_near";
+
+    /** near cache name 2. */
+    protected static String CACHE_NAME_CLOSE_NEAR = "cache_c_near";
 
     /** local cache name 1. */
-    protected static String CACHE_NAME_LOC_1 = "local1";
+    protected static String CACHE_NAME_DESTROY_LOC = "cache_d_local";
 
     /** local cache name 2. */
-    protected static String CACHE_NAME_LOC_2 = "local2";
+    protected static String CACHE_NAME_CLOSE_LOC = "cache_c_local";
 
     /**
      * @return Grids count to start.
@@ -73,72 +79,85 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
     public void testCacheStopAndDestroy() throws Exception {
         startGridsMultiThreaded(gridCount());
 
-        CacheConfiguration cCfg1 = defaultCacheConfiguration();
-        cCfg1.setName(CACHE_NAME_1);
-        cCfg1.setCacheMode(CacheMode.PARTITIONED);
-
-        CacheConfiguration cCfg2 = defaultCacheConfiguration();
-        cCfg2.setName(CACHE_NAME_2);
-        cCfg2.setCacheMode(CacheMode.PARTITIONED);
-
-        CacheConfiguration cCfg3 = defaultCacheConfiguration();
-        cCfg3.setName(CACHE_NAME_3);
-        cCfg3.setCacheMode(CacheMode.PARTITIONED);
-
-        CacheConfiguration cCfg4 = defaultCacheConfiguration();
-        cCfg4.setName(CACHE_NAME_4);
-        cCfg4.setCacheMode(CacheMode.PARTITIONED);
-
-        CacheConfiguration cCfgLoc1 = defaultCacheConfiguration();
-        cCfgLoc1.setName(CACHE_NAME_LOC_1);
-        cCfgLoc1.setCacheMode(CacheMode.LOCAL);
-
-        CacheConfiguration cCfgLoc2 = defaultCacheConfiguration();
-        cCfgLoc2.setName(CACHE_NAME_LOC_2);
-        cCfgLoc2.setCacheMode(CacheMode.LOCAL);
-
-        grid(0).getOrCreateCache(cCfg1);
-        grid(0).getOrCreateCache(cCfg2);
-        grid(0).getOrCreateCache(cCfg3);
-        grid(0).getOrCreateCache(cCfg4);
-        grid(0).getOrCreateCache(cCfgLoc1);
-        grid(0).getOrCreateCache(cCfgLoc2);
-
-        grid(0).cache(CACHE_NAME_1).put(KEY_VAL, KEY_VAL);
-        grid(0).cache(CACHE_NAME_2).put(KEY_VAL, KEY_VAL);
-        grid(0).cache(CACHE_NAME_3).put(KEY_VAL, KEY_VAL);
-        grid(0).cache(CACHE_NAME_4).put(KEY_VAL, KEY_VAL);
-        grid(0).cache(CACHE_NAME_LOC_1).put(KEY_VAL, KEY_VAL + 0);
-        grid(0).cache(CACHE_NAME_LOC_2).put(KEY_VAL, KEY_VAL + 0);
-        grid(1).cache(CACHE_NAME_LOC_1).put(KEY_VAL, KEY_VAL + 1);
-        grid(1).cache(CACHE_NAME_LOC_2).put(KEY_VAL, KEY_VAL + 1);
-
-        assert grid(0).cache(CACHE_NAME_1).get(KEY_VAL).equals(KEY_VAL);
-        assert grid(0).cache(CACHE_NAME_2).get(KEY_VAL).equals(KEY_VAL);
-        assert grid(0).cache(CACHE_NAME_3).get(KEY_VAL).equals(KEY_VAL);
-        assert grid(0).cache(CACHE_NAME_4).get(KEY_VAL).equals(KEY_VAL);
-        assert grid(0).cache(CACHE_NAME_LOC_1).get(KEY_VAL).equals(KEY_VAL + 0);
-        assert grid(0).cache(CACHE_NAME_LOC_2).get(KEY_VAL).equals(KEY_VAL + 0);
-        assert grid(1).cache(CACHE_NAME_LOC_1).get(KEY_VAL).equals(KEY_VAL + 1);
-        assert grid(1).cache(CACHE_NAME_LOC_2).get(KEY_VAL).equals(KEY_VAL + 1);
+        CacheConfiguration cCfgD = defaultCacheConfiguration();
+        cCfgD.setName(CACHE_NAME_DESTROY_DHT);
+        cCfgD.setCacheMode(CacheMode.PARTITIONED);
+
+        CacheConfiguration cCfgC = defaultCacheConfiguration();
+        cCfgC.setName(CACHE_NAME_CLOSE_DHT);
+        cCfgC.setCacheMode(CacheMode.PARTITIONED);
+
+        CacheConfiguration cCfgDClient = defaultCacheConfiguration();
+        cCfgDClient.setName(CACHE_NAME_DESTROY_CLIENT);
+        cCfgDClient.setCacheMode(CacheMode.PARTITIONED);
+
+        CacheConfiguration cCfgCClient = defaultCacheConfiguration();
+        cCfgCClient.setName(CACHE_NAME_CLOSE_CLIENT);
+        cCfgCClient.setCacheMode(CacheMode.PARTITIONED);
+
+        CacheConfiguration cCfgDNear = defaultCacheConfiguration();
+        cCfgDNear.setName(CACHE_NAME_DESTROY_NEAR);
+        cCfgDNear.setCacheMode(CacheMode.PARTITIONED);
+        cCfgDNear.setNearConfiguration(new NearCacheConfiguration());
+
+        CacheConfiguration cCfgCNear = defaultCacheConfiguration();
+        cCfgCNear.setName(CACHE_NAME_CLOSE_NEAR);
+        cCfgCNear.setCacheMode(CacheMode.PARTITIONED);
+        cCfgCNear.setNearConfiguration(new NearCacheConfiguration());
+
+        CacheConfiguration cCfgDLoc = defaultCacheConfiguration();
+        cCfgDLoc.setName(CACHE_NAME_DESTROY_LOC);
+        cCfgDLoc.setCacheMode(CacheMode.LOCAL);
+
+        CacheConfiguration cCfgCLoc = defaultCacheConfiguration();
+        cCfgCLoc.setName(CACHE_NAME_CLOSE_LOC);
+        cCfgCLoc.setCacheMode(CacheMode.LOCAL);
+
+        grid(0).getOrCreateCache(cCfgD);
+        grid(0).getOrCreateCache(cCfgC);
+        grid(0).getOrCreateCache(cCfgDClient);
+        grid(0).getOrCreateCache(cCfgCClient);
+        grid(0).getOrCreateCache(cCfgDNear);
+        grid(0).getOrCreateCache(cCfgCNear);
+        grid(0).getOrCreateCache(cCfgDLoc);
+        grid(0).getOrCreateCache(cCfgCLoc);
+
+        grid(0).cache(CACHE_NAME_DESTROY_DHT).put(KEY_VAL, KEY_VAL);
+        grid(0).cache(CACHE_NAME_CLOSE_DHT).put(KEY_VAL, KEY_VAL);
+        grid(0).cache(CACHE_NAME_DESTROY_CLIENT).put(KEY_VAL, KEY_VAL);
+        grid(0).cache(CACHE_NAME_CLOSE_CLIENT).put(KEY_VAL, KEY_VAL);
+        grid(0).cache(CACHE_NAME_DESTROY_LOC).put(KEY_VAL, KEY_VAL + 0);
+        grid(0).cache(CACHE_NAME_CLOSE_LOC).put(KEY_VAL, KEY_VAL + 0);
+        grid(1).cache(CACHE_NAME_DESTROY_LOC).put(KEY_VAL, KEY_VAL + 1);
+        grid(1).cache(CACHE_NAME_CLOSE_LOC).put(KEY_VAL, KEY_VAL + 1);
+
+        assert grid(0).cache(CACHE_NAME_DESTROY_DHT).get(KEY_VAL).equals(KEY_VAL);
+        assert grid(0).cache(CACHE_NAME_CLOSE_DHT).get(KEY_VAL).equals(KEY_VAL);
+        assert grid(0).cache(CACHE_NAME_DESTROY_CLIENT).get(KEY_VAL).equals(KEY_VAL);
+        assert grid(0).cache(CACHE_NAME_CLOSE_CLIENT).get(KEY_VAL).equals(KEY_VAL);
+        assert grid(0).cache(CACHE_NAME_DESTROY_LOC).get(KEY_VAL).equals(KEY_VAL + 0);
+        assert grid(0).cache(CACHE_NAME_CLOSE_LOC).get(KEY_VAL).equals(KEY_VAL + 0);
+        assert grid(1).cache(CACHE_NAME_DESTROY_LOC).get(KEY_VAL).equals(KEY_VAL + 1);
+        assert grid(1).cache(CACHE_NAME_CLOSE_LOC).get(KEY_VAL).equals(KEY_VAL + 1);
 
         //Destroy:
 
         //DHT Destroy. Cache should be removed from each node.
-        grid(0).cache(CACHE_NAME_1).destroy();
+
+        grid(0).cache(CACHE_NAME_DESTROY_DHT).destroy();
 
         try {
-            grid(0).cache(CACHE_NAME_1).get(KEY_VAL).equals(KEY_VAL);
+            grid(0).cache(CACHE_NAME_DESTROY_DHT).get(KEY_VAL);
             assert false;
         }
         catch (IllegalArgumentException | IllegalStateException ignored0) {
             try {
-                grid(1).cache(CACHE_NAME_1).get(KEY_VAL).equals(KEY_VAL);
+                grid(1).cache(CACHE_NAME_DESTROY_DHT).get(KEY_VAL);
                 assert false;
             }
             catch (IllegalArgumentException | IllegalStateException ignored1) {
                 try {
-                    grid(2).cache(CACHE_NAME_1).get(KEY_VAL).equals(KEY_VAL);
+                    grid(2).cache(CACHE_NAME_DESTROY_DHT).get(KEY_VAL);
                     assert false;
                 }
                 catch (IllegalArgumentException | IllegalStateException ignored2) {
@@ -148,20 +167,21 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
         }
 
         //DHT Destroy from client node. Cache should be removed from each node.
-        grid(2).cache(CACHE_NAME_2).destroy();// Client node.
+
+        grid(2).cache(CACHE_NAME_DESTROY_CLIENT).destroy();// Client node.
 
         try {
-            grid(0).cache(CACHE_NAME_2).get(KEY_VAL).equals(KEY_VAL);
+            grid(0).cache(CACHE_NAME_DESTROY_CLIENT).get(KEY_VAL);
             assert false;
         }
         catch (IllegalArgumentException | IllegalStateException ignored0) {
             try {
-                grid(1).cache(CACHE_NAME_2).get(KEY_VAL).equals(KEY_VAL);
+                grid(1).cache(CACHE_NAME_DESTROY_CLIENT).get(KEY_VAL);
                 assert false;
             }
             catch (IllegalArgumentException | IllegalStateException ignored1) {
                 try {
-                    grid(2).cache(CACHE_NAME_2).get(KEY_VAL).equals(KEY_VAL);
+                    grid(2).cache(CACHE_NAME_DESTROY_CLIENT).get(KEY_VAL);
                     assert false;
                 }
                 catch (IllegalArgumentException | IllegalStateException ignored2) {
@@ -171,20 +191,55 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
         }
 
         //Local destroy. Cache should be removed from each node.
-        grid(0).cache(CACHE_NAME_LOC_1).destroy();
+
+        grid(0).cache(CACHE_NAME_DESTROY_LOC).destroy();
+
+        try {
+            grid(0).cache(CACHE_NAME_DESTROY_LOC).get(KEY_VAL);
+            assert false;
+        }
+        catch (IllegalArgumentException | IllegalStateException ignored0) {
+            try {
+                grid(1).cache(CACHE_NAME_DESTROY_LOC).get(KEY_VAL);
+                assert false;
+            }
+            catch (IllegalArgumentException | IllegalStateException ignored1) {
+                try {
+                    grid(2).cache(CACHE_NAME_DESTROY_LOC).get(KEY_VAL);
+                    assert false;
+                }
+                catch (IllegalArgumentException | IllegalStateException ignored2) {
+                    // No-op
+                }
+            }
+        }
+
+        //Near destroy. Cache should be removed from each node.
+
+        grid(0).createNearCache(CACHE_NAME_DESTROY_NEAR, new NearCacheConfiguration());
+        grid(1).createNearCache(CACHE_NAME_DESTROY_NEAR, new NearCacheConfiguration());
+        grid(2).createNearCache(CACHE_NAME_DESTROY_NEAR, new NearCacheConfiguration());
+
+        grid(0).cache(CACHE_NAME_DESTROY_NEAR).put(KEY_VAL, KEY_VAL);
+
+        assert grid(0).cache(CACHE_NAME_DESTROY_NEAR).get(KEY_VAL).equals(KEY_VAL);
+        assert grid(1).cache(CACHE_NAME_DESTROY_NEAR).get(KEY_VAL).equals(KEY_VAL);
+        assert grid(2).cache(CACHE_NAME_DESTROY_NEAR).get(KEY_VAL).equals(KEY_VAL);
+
+        grid(0).cache(CACHE_NAME_DESTROY_NEAR).destroy();
 
         try {
-            grid(0).cache(CACHE_NAME_LOC_1).get(KEY_VAL).equals(KEY_VAL);
+            grid(0).cache(CACHE_NAME_DESTROY_NEAR).get(KEY_VAL);
             assert false;
         }
         catch (IllegalArgumentException | IllegalStateException ignored0) {
             try {
-                grid(1).cache(CACHE_NAME_LOC_1).get(KEY_VAL).equals(KEY_VAL);
+                grid(1).cache(CACHE_NAME_DESTROY_NEAR).get(KEY_VAL);
                 assert false;
             }
             catch (IllegalArgumentException | IllegalStateException ignored1) {
                 try {
-                    grid(2).cache(CACHE_NAME_LOC_1).get(KEY_VAL).equals(KEY_VAL);
+                    grid(2).cache(CACHE_NAME_DESTROY_NEAR).get(KEY_VAL);
                     assert false;
                 }
                 catch (IllegalArgumentException | IllegalStateException ignored2) {
@@ -196,41 +251,98 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
         //Close:
 
         //DHT Close. No-op.
-        grid(0).cache(CACHE_NAME_3).close();
 
-        assert grid(0).cache(CACHE_NAME_3).get(KEY_VAL).equals(KEY_VAL);// Not affected.
-        assert grid(1).cache(CACHE_NAME_3).get(KEY_VAL).equals(KEY_VAL);// Not affected.
-        assert grid(2).cache(CACHE_NAME_3).get(KEY_VAL).equals(KEY_VAL);// Not affected.
+        grid(0).cache(CACHE_NAME_CLOSE_DHT).close();
+
+        assert grid(0).cache(CACHE_NAME_CLOSE_DHT).get(KEY_VAL).equals(KEY_VAL);// Not affected.
+        assert grid(1).cache(CACHE_NAME_CLOSE_DHT).get(KEY_VAL).equals(KEY_VAL);// Not affected.
+        assert grid(2).cache(CACHE_NAME_CLOSE_DHT).get(KEY_VAL).equals(KEY_VAL);// Not affected.
+
+        //DHT Creation after closed.
+
+        grid(0).getOrCreateCache(cCfgC);
+
+        grid(0).cache(CACHE_NAME_CLOSE_DHT).put(KEY_VAL, KEY_VAL + "recreated");
+
+        assert grid(0).cache(CACHE_NAME_CLOSE_DHT).get(KEY_VAL).equals(KEY_VAL + "recreated");
+        assert grid(1).cache(CACHE_NAME_CLOSE_DHT).get(KEY_VAL).equals(KEY_VAL + "recreated");
+        assert grid(2).cache(CACHE_NAME_CLOSE_DHT).get(KEY_VAL).equals(KEY_VAL + "recreated");
 
         //DHT Close from client node. Should affect only client node.
-        grid(2).cache(CACHE_NAME_4).close();// Client node.
 
-        assert grid(0).cache(CACHE_NAME_4).get(KEY_VAL).equals(KEY_VAL);// Not affected.
-        assert grid(1).cache(CACHE_NAME_4).get(KEY_VAL).equals(KEY_VAL);// Not affected.
+        grid(2).cache(CACHE_NAME_CLOSE_CLIENT).close();// Client node.
+
+        assert grid(0).cache(CACHE_NAME_CLOSE_CLIENT).get(KEY_VAL).equals(KEY_VAL);// Not affected.
+        assert grid(1).cache(CACHE_NAME_CLOSE_CLIENT).get(KEY_VAL).equals(KEY_VAL);// Not affected.
 
         try {
-            grid(2).cache(CACHE_NAME_4).get(KEY_VAL).equals(KEY_VAL);// Affected.
+            grid(2).cache(CACHE_NAME_CLOSE_CLIENT).get(KEY_VAL);// Affected.
             assert false;
         }
         catch (IllegalArgumentException | IllegalStateException ignored) {
             // No-op
         }
 
+        //DHT Creation from client node after closed.
+
+        grid(2).getOrCreateCache(cCfgCClient);
+
+        grid(0).cache(CACHE_NAME_CLOSE_CLIENT).put(KEY_VAL, KEY_VAL + "recreated");
+
+        assert grid(0).cache(CACHE_NAME_CLOSE_CLIENT).get(KEY_VAL).equals(KEY_VAL + "recreated");
+        assert grid(1).cache(CACHE_NAME_CLOSE_CLIENT).get(KEY_VAL).equals(KEY_VAL + "recreated");
+        assert grid(2).cache(CACHE_NAME_CLOSE_CLIENT).get(KEY_VAL).equals(KEY_VAL + "recreated");
+
+        //Near Close from client node.
+
+        grid(2).createNearCache(CACHE_NAME_CLOSE_NEAR, new NearCacheConfiguration());
+
+        //Subscribing to events.
+        grid(2).cache(CACHE_NAME_CLOSE_NEAR).put(KEY_VAL, KEY_VAL);
+
+        grid(2).cache(CACHE_NAME_CLOSE_NEAR).close();
+
+        //Should not produce messages to client node.
+        grid(0).cache(CACHE_NAME_CLOSE_NEAR).put(KEY_VAL, KEY_VAL + 0);
+
+        assert grid(0).cache(CACHE_NAME_CLOSE_NEAR).get(KEY_VAL).equals(KEY_VAL + 0);// Not affected.
+        assert grid(1).cache(CACHE_NAME_CLOSE_NEAR).get(KEY_VAL).equals(KEY_VAL + 0);// Not affected.
+
+        try {
+            grid(2).cache(CACHE_NAME_CLOSE_NEAR).get(KEY_VAL);// Affected.
+            assert false;
+        }
+        catch (IllegalArgumentException | IllegalStateException ignored) {
+            // No-op
+        }
+
+        //Near Creation from client node after closed.
+
+        grid(2).getOrCreateCache(cCfgCNear);
+        grid(2).createNearCache(CACHE_NAME_CLOSE_NEAR, new NearCacheConfiguration());
+
+        grid(0).cache(CACHE_NAME_CLOSE_NEAR).put(KEY_VAL, KEY_VAL + "recreated");
+
+        assert grid(0).cache(CACHE_NAME_CLOSE_NEAR).get(KEY_VAL).equals(KEY_VAL + "recreated");
+        assert grid(1).cache(CACHE_NAME_CLOSE_NEAR).get(KEY_VAL).equals(KEY_VAL + "recreated");
+        assert grid(2).cache(CACHE_NAME_CLOSE_NEAR).get(KEY_VAL).equals(KEY_VAL + "recreated");
+
         //Local close. Same as Local destroy.
-        grid(1).cache(CACHE_NAME_LOC_2).close();
+
+        grid(1).cache(CACHE_NAME_CLOSE_LOC).close();
 
         try {
-            grid(0).cache(CACHE_NAME_LOC_2).get(KEY_VAL).equals(KEY_VAL);
+            grid(0).cache(CACHE_NAME_CLOSE_LOC).get(KEY_VAL);
             assert false;
         }
         catch (IllegalArgumentException | IllegalStateException ignored0) {
             try {
-                grid(1).cache(CACHE_NAME_LOC_2).get(KEY_VAL).equals(KEY_VAL);
+                grid(1).cache(CACHE_NAME_CLOSE_LOC).get(KEY_VAL);
                 assert false;
             }
             catch (IllegalArgumentException | IllegalStateException ignored1) {
                 try {
-                    grid(2).cache(CACHE_NAME_LOC_2).get(KEY_VAL).equals(KEY_VAL);
+                    grid(2).cache(CACHE_NAME_CLOSE_LOC).get(KEY_VAL);
                     assert false;
                 }
                 catch (IllegalArgumentException | IllegalStateException ignored2) {
@@ -238,5 +350,17 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest {
                 }
             }
         }
+
+        //Local creation after closed.
+
+        grid(0).getOrCreateCache(cCfgCLoc);
+
+        grid(0).cache(CACHE_NAME_CLOSE_LOC).put(KEY_VAL, KEY_VAL + "recreated0");
+        grid(1).cache(CACHE_NAME_CLOSE_LOC).put(KEY_VAL, KEY_VAL + "recreated1");
+        grid(2).cache(CACHE_NAME_CLOSE_LOC).put(KEY_VAL, KEY_VAL + "recreated2");
+
+        assert grid(0).cache(CACHE_NAME_CLOSE_LOC).get(KEY_VAL).equals(KEY_VAL + "recreated0");
+        assert grid(1).cache(CACHE_NAME_CLOSE_LOC).get(KEY_VAL).equals(KEY_VAL + "recreated1");
+        assert grid(2).cache(CACHE_NAME_CLOSE_LOC).get(KEY_VAL).equals(KEY_VAL + "recreated2");
     }
 }


[3/3] incubator-ignite git commit: Ignite-929

Posted by sb...@apache.org.
Ignite-929


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

Branch: refs/heads/ignite-929
Commit: 71b81e058c0e441f405d1083b6240cb3332819df
Parents: 7442023
Author: avinogradov <av...@gridgain.com>
Authored: Tue May 26 20:07:49 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue May 26 20:07:49 2015 +0300

----------------------------------------------------------------------
 .../discovery/GridDiscoveryManager.java         | 14 +++++++
 .../cache/DynamicCacheChangeRequest.java        | 39 ++++++++++++-------
 .../processors/cache/GridCacheProcessor.java    | 41 +++++++++++++++-----
 .../distributed/dht/GridDhtCacheEntry.java      |  3 +-
 4 files changed, 72 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71b81e05/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 0950774..9737002 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -240,6 +240,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
      *
      * @param cacheName Cache name.
      * @param clientNodeId Near node ID.
+     * @param nearEnabled Near cache enabled.
      */
     public void addClientNode(String cacheName, UUID clientNodeId, boolean nearEnabled) {
         CachePredicate predicate = registeredCaches.get(cacheName);
@@ -249,6 +250,19 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
     }
 
     /**
+     * Removes near node ID from cache filter.
+     *
+     * @param cacheName Cache name.
+     * @param clientNodeId Near node ID.
+     */
+    public void onNodeLeft(String cacheName, UUID clientNodeId) {
+        CachePredicate predicate = registeredCaches.get(cacheName);
+
+        if (predicate != null)
+            predicate.onNodeLeft(clientNodeId);
+    }
+
+    /**
      * @return Client nodes map.
      */
     public Map<String, Map<UUID, Boolean>> clientNodesMap() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71b81e05/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index c08a179..7af1572 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -57,6 +57,9 @@ public class DynamicCacheChangeRequest implements Serializable {
     /** Stop flag. */
     private boolean stop;
 
+    /** Close flag. */
+    private boolean close;
+
     /** Fail if exists flag. */
     private boolean failIfExists;
 
@@ -68,23 +71,10 @@ public class DynamicCacheChangeRequest implements Serializable {
      *
      * @param cacheName Cache stop name.
      * @param initiatingNodeId Initiating node ID.
-     * @param stop Stop flag.
      */
-    public DynamicCacheChangeRequest(String cacheName, UUID initiatingNodeId, boolean stop) {
+    public DynamicCacheChangeRequest(String cacheName, UUID initiatingNodeId) {
         this.cacheName = cacheName;
         this.initiatingNodeId = initiatingNodeId;
-
-        this.stop = stop;
-    }
-
-    /**
-     * Constructor means for start requests.
-     *
-     * @param cacheName Cache name.
-     * @param initiatingNodeId Initiating node ID.
-     */
-    public DynamicCacheChangeRequest(String cacheName, UUID initiatingNodeId) {
-        this(cacheName, initiatingNodeId, false);
     }
 
     /**
@@ -130,6 +120,13 @@ public class DynamicCacheChangeRequest implements Serializable {
     }
 
     /**
+     * @param stop New stop flag.
+     */
+    public void stop(boolean stop) {
+        this.stop = stop;
+    }
+
+    /**
      * @return Cache name.
      */
     public String cacheName() {
@@ -220,6 +217,20 @@ public class DynamicCacheChangeRequest implements Serializable {
         this.failIfExists = failIfExists;
     }
 
+    /**
+     * @return Close flag.
+     */
+    public boolean close() {
+        return close;
+    }
+
+    /**
+     * @param close New close flag.
+     */
+    public void close(boolean close) {
+        this.close = close;
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(DynamicCacheChangeRequest.class, this, "cacheName", cacheName());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71b81e05/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 4edfd8b..ccbf10a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1469,7 +1469,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @param req Request.
      */
     private void stopGateway(DynamicCacheChangeRequest req) {
-        assert req.stop();
+        assert req.stop() || req.close();
 
         // Break the proxy before exchange future is done.
         IgniteCacheProxy<?, ?> proxy = jCacheProxies.remove(maskNull(req.cacheName()));
@@ -1482,7 +1482,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @param req Stop request.
      */
     public void prepareCacheStop(DynamicCacheChangeRequest req) {
-        assert req.stop();
+        assert req.stop() || req.close();
 
         GridCacheAdapter<?, ?> cache = caches.remove(maskNull(req.cacheName()));
 
@@ -1939,7 +1939,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @return Future that will be completed when cache is destroyed.
      */
     public IgniteInternalFuture<?> dynamicDestroyCache(String cacheName) {
-        DynamicCacheChangeRequest t = new DynamicCacheChangeRequest(cacheName, ctx.localNodeId(), true);
+        DynamicCacheChangeRequest t = new DynamicCacheChangeRequest(cacheName, ctx.localNodeId());
+
+        t.stop(true);
 
         return F.first(initiateCacheChanges(F.asList(t)));
     }
@@ -1958,14 +1960,13 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             GridCacheAdapter<?, ?> cache = caches.get(maskNull(cacheName));
 
             if (cache != null && !cache.context().affinityNode()) {
-                if (caches.remove(maskNull(cacheName)) != null) {
-                    GridCacheContext<?, ?> ctx = cache.context();
+                GridCacheContext<?, ?> ctx = cache.context();
 
-                    sharedCtx.removeCacheContext(ctx);
+                DynamicCacheChangeRequest t = new DynamicCacheChangeRequest(cacheName, ctx.localNodeId());
 
-                    onKernalStop(cache, true);
-                    stopCache(cache, true);
-                }
+                t.close(true);
+
+                return F.first(initiateCacheChanges(F.asList(t)));
             }
 
             return null; // No-op.
@@ -1985,7 +1986,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             DynamicCacheStartFuture fut = new DynamicCacheStartFuture(req.cacheName(), req.deploymentId(), req);
 
             try {
-                if (req.stop()) {
+                if (req.stop() || req.close()) {
                     DynamicCacheDescriptor desc = registeredCaches.get(maskNull(req.cacheName()));
 
                     if (desc == null)
@@ -2127,6 +2128,26 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                     req.initiatingNodeId(),
                     req.nearCacheConfiguration() != null);
             }
+            else if (req.close()) {
+
+                if (req.initiatingNodeId().equals(ctx.localNodeId())) {
+                    stopGateway(req);
+
+                    prepareCacheStop(req);
+
+                    if (desc != null)
+                        registeredCaches.remove(maskNull(req.cacheName()), desc);
+                }
+
+                ctx.discovery().onNodeLeft(req.cacheName(), req.initiatingNodeId());
+
+                DynamicCacheStartFuture changeFut = (DynamicCacheStartFuture)pendingFuts.get(maskNull(req.cacheName()));
+
+                if (changeFut != null && changeFut.deploymentId().equals(req.deploymentId())) {
+                    // No-op.
+                    changeFut.onDone();
+                }
+            }
             else {
                 if (desc == null) {
                     // If local node initiated start, fail the start future.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71b81e05/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
index c9a7af8..1ecc63c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java
@@ -601,7 +601,8 @@ public class GridDhtCacheEntry extends GridDistributedCacheEntry {
         List<ReaderId> newRdrs = null;
 
         for (int i = 0; i < rdrs.length; i++) {
-            if (!cctx.discovery().alive(rdrs[i].nodeId())) {
+            if (!cctx.discovery().alive(rdrs[i].nodeId()) ||
+                !cctx.discovery().cacheNode(cctx.discovery().node(rdrs[i].nodeId), cacheName())) {
                 // Node has left and if new list has already been created, just skip.
                 // Otherwise, create new list and add alive nodes.
                 if (newRdrs == null) {