ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [19/25] ignite git commit: ignite-5075
Date Thu, 01 Jun 2017 15:44:26 GMT
http://git-wip-us.apache.org/repos/asf/ignite/blob/781e33ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index 5dd3000..56f1183 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@ -134,7 +134,7 @@ public class GridClusterStateProcessor extends GridProcessorAdapter {
         cacheProc = ctx.cache();
         sharedCtx = cacheProc.context();
 
-        sharedCtx.io().addHandler(false, 0,
+        sharedCtx.io().addCacheHandler(0,
             GridChangeGlobalStateMessageResponse.class,
             new CI2<UUID, GridChangeGlobalStateMessageResponse>() {
                 @Override public void apply(UUID nodeId, GridChangeGlobalStateMessageResponse
msg) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/781e33ec/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
index 93f4830..587537d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
@@ -1447,8 +1447,8 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
         for (Integer p : aff.primaryPartitions(srv1.cluster().localNode()))
             srv1Parts.add(p);
 
-        CacheGroupInfrastructure grpSrv0 = cacheGroup(srv0, GROUP1);
-        CacheGroupInfrastructure grpSrv1 = cacheGroup(srv1, GROUP1);
+        CacheGroupContext grpSrv0 = cacheGroup(srv0, GROUP1);
+        CacheGroupContext grpSrv1 = cacheGroup(srv1, GROUP1);
 
         for (int p = 0; p < aff.partitions(); p++) {
             if (srv1Parts.contains(p)) {
@@ -2490,6 +2490,267 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest
{
     /**
      * @throws Exception If failed.
      */
+    public void testCacheIdConflict() throws Exception {
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("AaAaAa"), new CacheConfiguration("AaAaBB")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(0);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("AaAaAa")};
+
+        startGrid(0);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("AaAaBB")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(1);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains("AaAaBB"));
+
+        final Ignite ignite1 = startGrid(1);
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                ignite1.createCache(new CacheConfiguration("AaAaBB"));
+
+                return null;
+            }
+        }, CacheException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains("AaAaBB"));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheGroupIdConflict1() throws Exception {
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration(CACHE1).setGroupName("AaAaAa"),
+            new CacheConfiguration(CACHE2).setGroupName("AaAaBB")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(0);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration(CACHE1).setGroupName("AaAaAa")};
+
+        startGrid(0);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration(CACHE2).setGroupName("AaAaBB")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(1);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains(CACHE2));
+
+        final Ignite ignite1 = startGrid(1);
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                ignite1.createCache(new CacheConfiguration(CACHE2).setGroupName("AaAaBB"));
+
+                return null;
+            }
+        }, CacheException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains(CACHE2));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheGroupIdConflict2() throws Exception {
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("AaAaAa"),
+            new CacheConfiguration(CACHE2).setGroupName("AaAaBB")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(0);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("AaAaAa")};
+
+        startGrid(0);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration(CACHE2).setGroupName("AaAaBB")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(1);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains(CACHE2));
+
+        final Ignite ignite1 = startGrid(1);
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                ignite1.createCache(new CacheConfiguration(CACHE2).setGroupName("AaAaBB"));
+
+                return null;
+            }
+        }, CacheException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains(CACHE2));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheGroupIdConflict3() throws Exception {
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration(CACHE2).setGroupName("AaAaBB"),
+            new CacheConfiguration("AaAaAa")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(0);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration(CACHE2).setGroupName("AaAaBB")};
+
+        startGrid(0);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("AaAaAa")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(1);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains("AaAaAa"));
+
+        final Ignite ignite1 = startGrid(1);
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                ignite1.createCache(new CacheConfiguration("AaAaAa"));
+
+                return null;
+            }
+        }, CacheException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains("AaAaAa"));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheGroupNameConflict1() throws Exception {
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("cache1"), new CacheConfiguration("cache2").setGroupName("cache1")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(0);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("cache1")};
+
+        startGrid(0);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("cache2").setGroupName("cache1")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(1);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains("cache2"));
+
+        final Ignite ignite1 = startGrid(1);
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                ignite1.createCache(new CacheConfiguration("cache2").setGroupName("cache1"));
+
+                return null;
+            }
+        }, CacheException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains("cache2"));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheGroupNameConflict2() throws Exception {
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("cache2").setGroupName("cache1"),
new CacheConfiguration("cache1")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(0);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("cache2").setGroupName("cache1")};
+
+        startGrid(0);
+
+        ccfgs = new CacheConfiguration[]{new CacheConfiguration("cache1")};
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                startGrid(1);
+
+                return null;
+            }
+        }, IgniteCheckedException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains("cache1"));
+
+        final Ignite ignite1 = startGrid(1);
+
+        GridTestUtils.assertThrows(log, new Callable<Void>() {
+            @Override public Void call() throws Exception {
+                ignite1.createCache(new CacheConfiguration("cache1"));
+
+                return null;
+            }
+        }, CacheException.class, null);
+
+        assertFalse(ignite(0).cacheNames().contains("cache1"));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
     public void testConfigurationConsistencyValidation() throws Exception {
         startGrids(2);
 
@@ -2841,7 +3102,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
             }
         }, 5, "update-thread");
 
-        CacheGroupInfrastructure grp = cacheGroup(node, GROUP1);
+        CacheGroupContext grp = cacheGroup(node, GROUP1);
 
         Integer cacheId = null;
 
@@ -3022,7 +3283,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
                 }
 
                 for (int n = 0; n < SRVS; n++) {
-                    CacheGroupInfrastructure grp = cacheGroup(ignite(n), GROUP1);
+                    CacheGroupContext grp = cacheGroup(ignite(n), GROUP1);
 
                     assertNotNull(grp);
 
@@ -3464,8 +3725,8 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
      * @param grpName Cache group name.
      * @return Cache group.
      */
-    private CacheGroupInfrastructure cacheGroup(Ignite node, String grpName) {
-        for (CacheGroupInfrastructure grp : ((IgniteKernal)node).context().cache().cacheGroups())
{
+    private CacheGroupContext cacheGroup(Ignite node, String grpName) {
+        for (CacheGroupContext grp : ((IgniteKernal)node).context().cache().cacheGroups())
{
             if (grpName.equals(grp.name()))
                 return grp;
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/781e33ec/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 306dff8..a8ca749 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
@@ -68,7 +68,7 @@ import org.apache.ignite.internal.binary.BinaryContext;
 import org.apache.ignite.internal.binary.BinaryEnumCache;
 import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.cache.CacheGroupInfrastructure;
+import org.apache.ignite.internal.processors.cache.CacheGroupContext;
 import org.apache.ignite.internal.processors.resource.GridSpringResourceContext;
 import org.apache.ignite.internal.util.GridClassLoaderCache;
 import org.apache.ignite.internal.util.GridTestClockTimer;
@@ -2107,7 +2107,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @return Cache group ID for given cache name.
      */
     protected final int groupIdForCache(Ignite node, String cacheName) {
-        for (CacheGroupInfrastructure grp : ((IgniteKernal)node).context().cache().cacheGroups())
{
+        for (CacheGroupContext grp : ((IgniteKernal)node).context().cache().cacheGroups())
{
             if (grp.hasCache(cacheName))
                 return grp.groupId();
         }


Mime
View raw message