From 48d7a23c2982da183988c0db0753bb71e42940b4 Mon Sep 17 00:00:00 2001 From: sanpwc Date: Tue, 12 Nov 2019 10:27:23 +0300 Subject: [PATCH 1/4] IGNITE-13868 Tests added for create caches simultaneously in same non-existing cache group led to NPE. --- ...tionDestructionWileTopologyChangeTest.java | 69 + ...lientSizeCacheCreationDestructionTest.java | 1241 +++++++++++++++++ 2 files changed, 1310 insertions(+) create mode 100644 modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java create mode 100644 modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java diff --git a/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java b/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java new file mode 100644 index 0000000000000..592b49d2ba662 --- /dev/null +++ b/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java @@ -0,0 +1,69 @@ +/* + * Copyright 2019 GridGain Systems, Inc. and Contributors. + * + * Licensed under the GridGain Community Edition License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.ignite.common; + +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.testframework.GridTestUtils; + +import java.util.UUID; +import java.util.concurrent.atomic.AtomicBoolean; + +/** + * {@inheritDoc} With topology events in parallel + */ +public class ClientSideCacheCreationDestructionWileTopologyChangeTest extends ClientSizeCacheCreationDestructionTest { + /** **/ + private static final int MAX_NODES_CNT = 10; + + /** **/ + IgniteInternalFuture topChangeProcFut; + + /** **/ + AtomicBoolean procTopChanges = new AtomicBoolean(true); + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + super.beforeTest(); + + topChangeProcFut = asyncTopologyChanges(); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + procTopChanges.set(false); + + topChangeProcFut.get(); + + super.afterTest(); + } + + /** + * @return {@code IgniteInternalFuture} to wait for topology process to stop in {@code afterTest()}. + */ + private IgniteInternalFuture asyncTopologyChanges() { + return GridTestUtils.runAsync(() -> { + while (procTopChanges.get()) { + try { + if (srv.cluster().nodes().size() < MAX_NODES_CNT) + startGrid(UUID.randomUUID().toString()); + } + catch (Exception e) { + fail("Unable to add or remove node: " + e); + } + } + }); + } +} diff --git a/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java b/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java new file mode 100644 index 0000000000000..f61bc9a22cec1 --- /dev/null +++ b/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java @@ -0,0 +1,1241 @@ +/* + * Copyright 2019 GridGain Systems, Inc. and Contributors. + * + * Licensed under the GridGain Community Edition License (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.ignite.common; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Serializable; +import java.net.URL; +import java.net.URLConnection; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import javax.cache.CacheException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.Ignition; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.client.ClientCacheConfiguration; +import org.apache.ignite.client.IgniteClient; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.ClientConfiguration; +import org.apache.ignite.configuration.ConnectorConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.client.thin.ClientServerError; +import org.apache.ignite.internal.jdbc.thin.JdbcThinConnection; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; + +/** + * Tests for cache creation and destruction from servers and clients: thin, thick, jdbc and rest. + * Including simultaneous operations. Mainly within same cache group. + */ +@SuppressWarnings({"ThrowableNotThrown", "unchecked"}) +public class ClientSizeCacheCreationDestructionTest extends GridCommonAbstractTest { + /** **/ + private static final String CACHE_NAME = "CacheName"; + + /** **/ + private static final String ANOTHER_CACHE_NAME = "AnotherCacheName"; + + /** **/ + private static final String CLIENT_CACHE_NAME = "ClientCacheName"; + + /** **/ + private static final String CACHE_GROUP_NAME = "CacheGroupName"; + + /** **/ + protected Ignite srv; + + /** **/ + private Ignite thickClient; + + /** **/ + private IgniteClient thinClient; + + /** **/ + private Connection jdbcConn; + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + IgniteConfiguration configuration = super.getConfiguration(igniteInstanceName); + + configuration.setConnectorConfiguration(new ConnectorConfiguration()); + + return configuration; + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + super.beforeTest(); + + srv = startGrid("server"); + + thickClient = startClientGrid(1); + + thinClient = Ignition.startClient(new ClientConfiguration().setAddresses("127.0.0.1:10800")); + + jdbcConn = DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1:10800"); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + super.afterTest(); + + if (thickClient != null) + thickClient.close(); + + if (thinClient != null) + thinClient.close(); + + if (jdbcConn != null) + jdbcConn.close(); + + stopAllGrids(); + } + + /** + * Direct scenario: + *
    + *
  1. Start server node, create cache in cache group.
    2. + *
  2. Start client node and create cache in same cache group.
    3. + *
  3. Assert no exception, cache successfully created, value may be inserted into this cache.
    4. + *
+ * + * @throws Exception If failed. + */ + @Test + public void testServerThenClientCacheCreation() throws Exception { + createCache(srv, cacheConfig()); + + createCache(thickClient, cacheConfig().setName(CLIENT_CACHE_NAME)); + + IgniteCache cache = srv.cache(CLIENT_CACHE_NAME); + + cache.put(1L, "abc"); + + assertEquals("abc", cache.get(1L)); + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches in 4 different cache groups: each cache + * in corresponding cache group.
    2. + *
  2. Start Thick client node, create 1 new cache in each created cache group.
    3. + *
  3. Assert that 4 cache groups exist with 2 caches each.
    4. + *
  4. Try to insert and get some data from caches.
    5. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithinFourCacheGroupsThickClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME + i).setName(CACHE_NAME + i)); + + for (int i = 0; i < 4; i++) + createCache(thickClient, cacheConfig().setGroupName(CACHE_GROUP_NAME + i).setName(CLIENT_CACHE_NAME + i)); + + // Assertions. + assertEquals(8, srv.cacheNames().size()); + + for (int i = 0; i < 4; i++) { + assertEquals(CACHE_GROUP_NAME + i, + srv.cache(CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + assertEquals(CACHE_GROUP_NAME + i, + srv.cache(CLIENT_CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + srv.cache(CACHE_NAME + i).put(1, "abc_srv" + i); + assertEquals("abc_srv" + i, srv.cache(CACHE_NAME + i).get(1)); + + srv.cache(CLIENT_CACHE_NAME + i).put(1, "abc_cli" + i); + assertEquals("abc_cli" + i, srv.cache(CLIENT_CACHE_NAME + i).get(1)); + } + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches in 4 different cache groups: each cache + * in corresponding cache group.
    2. + *
  2. Start Thin client node, create 1 new cache in each created cache group.
    3. + *
  3. Assert that 4 cache groups exist with 2 caches each.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithinFourCacheGroupsThinClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME + i).setName(CACHE_NAME + i)); + + for (int i = 0; i < 4; i++) { + createCache(thinClient, clientCacheConfig().setGroupName(CACHE_GROUP_NAME + i). + setName(CLIENT_CACHE_NAME + i)); + } + + // Assertions. + assertEquals(8, srv.cacheNames().size()); + + for (int i = 0; i < 4; i++) { + assertEquals(CACHE_GROUP_NAME + i, + srv.cache(CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + assertEquals(CACHE_GROUP_NAME + i, + srv.cache(CLIENT_CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + srv.cache(CACHE_NAME + i).put(1, "abc_srv" + i); + assertEquals("abc_srv" + i, srv.cache(CACHE_NAME + i).get(1)); + + srv.cache(CLIENT_CACHE_NAME + i).put(1, "abc_cli" + i); + assertEquals("abc_cli" + i, srv.cache(CLIENT_CACHE_NAME + i).get(1)); + } + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches in 4 different cache groups: each cache + * in corresponding cache group.
    2. + *
  2. Start Jdbc Thin client node, create 1 new cache in each created cache group.
    3. + *
  3. Assert that 4 cache groups exist with 2 caches each.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithinFourCacheGroupsJdbcThinClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME + i).setName(CACHE_NAME + i)); + + for (int i = 0; i < 4; i++) + createCache(jdbcConn, cacheConfig().setGroupName(CACHE_GROUP_NAME + i).setName(CLIENT_CACHE_NAME + i)); + + // Assertions. + assertEquals(8, srv.cacheNames().size()); + + for (int i = 0; i < 4; i++) { + assertEquals(CACHE_GROUP_NAME + i, + srv.cache(CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + assertEquals(CACHE_GROUP_NAME + i, + srv.cache("SQL_PUBLIC_" + CLIENT_CACHE_NAME.toUpperCase() + i). + getConfiguration(CacheConfiguration.class).getGroupName()); + + srv.cache(CACHE_NAME + i).put(1, "abc_srv" + i); + assertEquals("abc_srv" + i, srv.cache(CACHE_NAME + i).get(1)); + + srv.cache("SQL_PUBLIC_" + CLIENT_CACHE_NAME.toUpperCase() + i).put(1, "abc_cli" + i); + assertEquals("abc_cli" + i, + srv.cache("SQL_PUBLIC_" + CLIENT_CACHE_NAME.toUpperCase() + i).get(1)); + } + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches in 4 different cache groups: each cache + * in corresponding cache group.
    2. + *
  2. Start Rest client node, create 1 new cache in each created cache group.
    3. + *
  3. Assert that 4 cache groups exist with 2 caches each.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithinFourCacheGroupsRestClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME + i).setName(CACHE_NAME + i)); + + for (int i = 0; i < 4; i++) + createCacheWithRestClient(cacheConfig().setGroupName(CACHE_GROUP_NAME + i).setName(CLIENT_CACHE_NAME + i)); + + // Assertions. + assertEquals(8, srv.cacheNames().size()); + + for (int i = 0; i < 4; i++) { + assertEquals(CACHE_GROUP_NAME + i, + srv.cache(CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + assertEquals(CACHE_GROUP_NAME + i, + srv.cache(CLIENT_CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + srv.cache(CACHE_NAME + i).put(1, "abc_srv" + i); + assertEquals("abc_srv" + i, srv.cache(CACHE_NAME + i).get(1)); + + srv.cache(CLIENT_CACHE_NAME + i).put(1, "abc_cli" + i); + assertEquals("abc_cli" + i, srv.cache(CLIENT_CACHE_NAME + i).get(1)); + } + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches in 2 different cache groups in server node (2+2).
    2. + *
  2. Start Thick client node, create 2 new caches in each created cache group.
    3. + *
  3. Assert that 2 cache groups exist with 4 caches each.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithinTwoCacheGroupsThickClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME + (i % 2)).setName(CACHE_NAME + i)); + + for (int i = 0; i < 4; i++) { + createCache(thickClient, cacheConfig().setGroupName(CACHE_GROUP_NAME + (i % 2)). + setName(CLIENT_CACHE_NAME + i)); + } + + // Assertions. + assertEquals(8, srv.cacheNames().size()); + + for (int i = 0; i < 4; i++) { + assertEquals(CACHE_GROUP_NAME + (i % 2), + srv.cache(CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + assertEquals(CACHE_GROUP_NAME + (i % 2), + srv.cache(CLIENT_CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + srv.cache(CACHE_NAME + i).put(1, "abc_srv" + i); + assertEquals("abc_srv" + i, srv.cache(CACHE_NAME + i).get(1)); + + srv.cache(CLIENT_CACHE_NAME + i).put(1, "abc_cli" + i); + assertEquals("abc_cli" + i, srv.cache(CLIENT_CACHE_NAME + i).get(1)); + } + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches in 2 different cache groups in server node (2+2).
    2. + *
  2. Start Thin client node, create 2 new caches in each created cache group.
    3. + *
  3. Assert that 2 cache groups exist with 4 caches each.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithinTwoCacheGroupsThinClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME + (i % 2)).setName(CACHE_NAME + i)); + + for (int i = 0; i < 4; i++) { + createCache(thinClient, clientCacheConfig().setGroupName(CACHE_GROUP_NAME + (i % 2)). + setName(CLIENT_CACHE_NAME + i)); + } + + // Assertions. + assertEquals(8, srv.cacheNames().size()); + + for (int i = 0; i < 4; i++) { + assertEquals(CACHE_GROUP_NAME + (i % 2), + srv.cache(CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + assertEquals(CACHE_GROUP_NAME + (i % 2), + srv.cache(CLIENT_CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + srv.cache(CACHE_NAME + i).put(1, "abc_srv" + i); + assertEquals("abc_srv" + i, srv.cache(CACHE_NAME + i).get(1)); + + srv.cache(CLIENT_CACHE_NAME + i).put(1, "abc_cli" + i); + assertEquals("abc_cli" + i, srv.cache(CLIENT_CACHE_NAME + i).get(1)); + } + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches in 2 different cache groups in server node (2+2).
    2. + *
  2. Start Jdbc Thin client node, create 2 new caches in each created cache group.
    3. + *
  3. Assert that 2 cache groups exist with 4 caches each.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithinTwoCacheGroupsJdbcThinClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME + (i % 2)).setName(CACHE_NAME + i)); + + for (int i = 0; i < 4; i++) { + createCache(jdbcConn, cacheConfig().setGroupName(CACHE_GROUP_NAME + (i % 2)). + setName(CLIENT_CACHE_NAME + i)); + } + // Assertions. + assertEquals(8, srv.cacheNames().size()); + + for (int i = 0; i < 4; i++) { + assertEquals(CACHE_GROUP_NAME + (i % 2), + srv.cache(CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + assertEquals(CACHE_GROUP_NAME + (i % 2), + srv.cache("SQL_PUBLIC_" + CLIENT_CACHE_NAME.toUpperCase() + i). + getConfiguration(CacheConfiguration.class).getGroupName()); + + srv.cache(CACHE_NAME + i).put(1, "abc_srv" + i); + assertEquals("abc_srv" + i, srv.cache(CACHE_NAME + i).get(1)); + + srv.cache("SQL_PUBLIC_" + CLIENT_CACHE_NAME.toUpperCase() + i).put(1, "abc_cli" + i); + assertEquals("abc_cli" + i, + srv.cache("SQL_PUBLIC_" + CLIENT_CACHE_NAME.toUpperCase() + i).get(1)); + } + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches in 2 different cache groups in server node (2+2).
    2. + *
  2. Start Rest client node, create 2 new caches in each created cache group.
    3. + *
  3. Assert that 2 cache groups exist with 4 caches each.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithinTwoCacheGroupsRestClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME + (i % 2)).setName(CACHE_NAME + i)); + + for (int i = 0; i < 4; i++) { + createCacheWithRestClient(cacheConfig().setGroupName(CACHE_GROUP_NAME + (i % 2)). + setName(CLIENT_CACHE_NAME + i)); + } + // Assertions. + assertEquals(8, srv.cacheNames().size()); + + for (int i = 0; i < 4; i++) { + assertEquals(CACHE_GROUP_NAME + (i % 2), + srv.cache(CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + assertEquals(CACHE_GROUP_NAME + (i % 2), + srv.cache(CLIENT_CACHE_NAME + i).getConfiguration(CacheConfiguration.class).getGroupName()); + + srv.cache(CACHE_NAME + i).put(1, "abc_srv" + i); + assertEquals("abc_srv" + i, srv.cache(CACHE_NAME + i).get(1)); + + srv.cache(CLIENT_CACHE_NAME + i).put(1, "abc_cli" + i); + assertEquals("abc_cli" + i, srv.cache(CLIENT_CACHE_NAME + i).get(1)); + } + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches without cache groups.
    2. + *
  2. Start Thick client node, try to create cache with + * cache group with a name == first cache name.
    3. + *
  3. {@code CacheException} expected with message: + * 'Failed to start cache. Cache group name conflict with existing cache (change group name)'.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithCacheGroupNameEqualsFirstCacheNameThickClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfigWithoutCacheGroup().setName(CACHE_NAME + i)); + + GridTestUtils.assertThrows( + null, + () -> { + createCache(thickClient, cacheConfig().setGroupName(CACHE_NAME + 0).setName(CLIENT_CACHE_NAME)); + + return null; + }, + CacheException.class, + "Failed to start cache. Cache group name conflict with existing cache (change group name)"); + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches without cache groups.
    2. + *
  2. Start Thin client node, try to create cache with cache group with a name == first cache name.
    3. + *
  3. {@code ClientServerError} expected with message: + * 'Failed to start cache. Cache group name conflict with existing cache (change group name)'.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithCacheGroupNameEqualsFirstCacheNameThinClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfigWithoutCacheGroup().setName(CACHE_NAME + i)); + + GridTestUtils.assertThrows( + null, + () -> { + createCache(thinClient, clientCacheConfig().setGroupName(CACHE_NAME + 0).setName(CLIENT_CACHE_NAME)); + + return null; + }, + ClientServerError.class, + "Failed to start cache. Cache group name conflict with existing cache (change group name)"); + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches without cache groups.
    2. + *
  2. Start Jdbc Thin client node, try to create cache + * with cache group with a name == first cache name.
    3. + *
  3. {@code SQLException} expected with message: + * 'Failed to start cache. Cache group name conflict with existing cache (change group name)'.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithCacheGroupNameEqualsFirstCacheNameJdbcThinClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfigWithoutCacheGroup().setName(CACHE_NAME + i)); + + GridTestUtils.assertThrows( + null, + () -> { + createCache(jdbcConn, cacheConfig().setGroupName(CACHE_NAME + 0).setName(CLIENT_CACHE_NAME)); + + return null; + }, + SQLException.class, + "Failed to start cache. Cache group name conflict with existing cache (change group name)"); + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches without cache groups.
    2. + *
  2. Start Rest client node, try to create cache with cache group with a name == first cache name.
    3. + *
  3. {@code Exception} expected.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithCacheGroupNameEqualsFirstCacheNameRestClient() throws Exception { + for (int i = 0; i < 4; i++) + createCache(srv, cacheConfigWithoutCacheGroup().setName(CACHE_NAME + i)); + + GridTestUtils.assertThrows( + null, + () -> { + createCacheWithRestClient(cacheConfig().setGroupName(CACHE_NAME + 0).setName(CLIENT_CACHE_NAME)); + return null; + }, + AssertionError.class, + "expected:<0> but was:<1>"); + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches with cache groups.
    2. + *
  2. Start Thick client node, try to create extra cache within same cache group but with different + * config.
    3. + *
  3. {@code CacheException} expected + * with message 'Backups mismatch for caches related to the same group'.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithDifferentConfigThickClient() throws Exception { + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CACHE_NAME).setBackups(1)); + + GridTestUtils.assertThrows( + null, + () -> { + createCache(thickClient, cacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CLIENT_CACHE_NAME). + setBackups(2)); + + return null; + }, + CacheException.class, + "Backups mismatch for caches related to the same group"); + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches with cache groups.
    2. + *
  2. Start Thin client node, try to create extra cache within same cache group but with different + * config.
    3. + *
  3. {@code ClientServerError} expected + * with message 'Backups mismatch for caches related to the same group'.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithDifferentConfigThinClient() throws Exception { + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CACHE_NAME).setBackups(1)); + + GridTestUtils.assertThrows( + null, + () -> { + createCache(thinClient, clientCacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CLIENT_CACHE_NAME). + setBackups(2)); + + return null; + }, + ClientServerError.class, + "Backups mismatch for caches related to the same group"); + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches with cache groups.
    2. + *
  2. Start Jdbc Thin client node, try to create extra cache within same cache group but with different + * config.
    3. + *
  3. {@code SQLException} expected with message 'Backups mismatch for caches related to the same group'.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithDifferentConfigJdbcThinClient() throws Exception { + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CACHE_NAME).setBackups(1)); + + GridTestUtils.assertThrows( + null, + () -> { + createCache(jdbcConn, cacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CLIENT_CACHE_NAME). + setBackups(2)); + + return null; + }, + SQLException.class, + "Backups mismatch for caches related to the same group"); + } + + /** + * Few caches created in chain: + *
    + *
  1. Start server node, create 4 different caches with cache groups.
    2. + *
  2. Start Rest client node, try to create extra cache within same cache group but with different + * config.
    3. + *
  3. Exception is expected.
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testFewCachesCreatedInChainWithDifferentConfigRestClient() throws Exception { + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CACHE_NAME).setBackups(1)); + + GridTestUtils.assertThrows( + null, + () -> { + createCacheWithRestClient(cacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CLIENT_CACHE_NAME). + setBackups(2)); + + return null; + }, + AssertionError.class, + "expected:<0> but was:<1>"); + } + + /** + * Destroy caches: + *
    + *
  1. Start server node, create 2 caches in single cache group.
    2. + *
  2. Start Thick client and try to destroy 2 caches at the same time from client and from server.
    3. + *
  3. Assert that operation completed successfully, both caches are destroyed and cache group is no longer + * exists (for example create cache with same name as deleted cache group)
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testDestroyCachesThickClient() throws Exception { + for (int i = 0; i < 2; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CACHE_NAME + i)); + + CountDownLatch latch = new CountDownLatch(1); + + IgniteInternalFuture srv = GridTestUtils.runAsync(() -> { + try { + latch.await(); + } + catch (InterruptedException e) { + fail(e.toString()); + } + this.srv.destroyCache(CACHE_NAME + 0); + }); + + IgniteInternalFuture client = GridTestUtils.runAsync(() -> { + try { + latch.await(); + } + catch (InterruptedException e) { + fail(e.toString()); + } + thickClient.destroyCache(CACHE_NAME + 1); + }); + + latch.countDown(); + + srv.get(); + + client.get(); + + assertEquals(0, this.srv.cacheNames().size()); + + this.srv.createCache(CACHE_GROUP_NAME); + } + + /** + * Destroy caches: + *
    + *
  1. Start server node, create 2 caches in single cache group.
    2. + *
  2. Start Thin client and try to destroy 2 caches at the same time from client and from server.
    3. + *
  3. Assert that operation completed successfully, both caches are destroyed and cache group is no longer + * exists (for example create cache with same name as deleted cache group)
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testDestroyCachesThinClient() throws Exception { + for (int i = 0; i < 2; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CACHE_NAME + i)); + + CountDownLatch latch = new CountDownLatch(1); + + IgniteInternalFuture srv = GridTestUtils.runAsync(() -> { + try { + latch.await(); + } + catch (InterruptedException e) { + fail(e.toString()); + } + this.srv.destroyCache(CACHE_NAME + 0); + }); + + IgniteInternalFuture client = GridTestUtils.runAsync(() -> { + try { + latch.await(); + } + catch (InterruptedException e) { + fail(e.toString()); + } + thinClient.destroyCache(CACHE_NAME + 1); + }); + + latch.countDown(); + + srv.get(); + + client.get(); + + assertEquals(0, this.srv.cacheNames().size()); + + this.srv.createCache(CACHE_GROUP_NAME); + } + + /** + * Destroy caches: + *
    + *
  1. Start server node, create 2 caches in single cache group.
    2. + *
  2. Start Rest client and try to destroy 2 caches at the same time from client and from server.
    3. + *
  3. Assert that operation completed successfully, both caches are destroyed and cache group is no longer + * exists (for example create cache with same name as deleted cache group)
    4. + *
+ * @throws Exception If failed. + */ + @Test + public void testDestroyCachesRestClient() throws Exception { + for (int i = 0; i < 2; i++) + createCache(srv, cacheConfig().setGroupName(CACHE_GROUP_NAME).setName(CACHE_NAME + i)); + + CountDownLatch latch = new CountDownLatch(1); + + IgniteInternalFuture srv = GridTestUtils.runAsync(() -> { + try { + latch.await(); + } + catch (InterruptedException e) { + fail(e.toString()); + } + this.srv.destroyCache(CACHE_NAME + 0); + }); + + IgniteInternalFuture client = GridTestUtils.runAsync(() -> { + try { + latch.await(); + } + catch (InterruptedException e) { + fail(e.toString()); + } + + URLConnection conn = null; + try { + conn = new URL("http://localhost:8080/ignite?cmd=destcache&cacheName=" + CACHE_NAME + "1"). + openConnection(); + } + catch (IOException e) { + fail(e.toString()); + } + + try { + conn.connect(); + + try (InputStreamReader streamReader = new InputStreamReader(conn.getInputStream())) { + ObjectMapper objMapper = new ObjectMapper(); + Map myMap = objMapper.readValue(streamReader, + new TypeReference>() { + }); + + log.info("Version command response is: " + myMap); + + assertTrue(myMap.containsKey("response")); + assertEquals(0, myMap.get("successStatus")); + } + } + catch (IOException e) { + fail(e.toString()); + } + + }); + + latch.countDown(); + + srv.get(); + + client.get(); + + assertEquals(0, this.srv.cacheNames().size()); + + this.srv.createCache(CACHE_GROUP_NAME); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start Thick client.
    2. + *
  2. Create new cache with an existing cache group on server side.
    3. + *
  3. Destroy newly created cache through client.
    4. + *
+ *

+ * Expected: + * Only one cache, initially created within server node is expected. + */ + @Test + public void testCreateOnSrvDestroyOnThickClient() { + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + srv.createCache(cacheConfig()); + + thickClient.destroyCache(CACHE_NAME); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start Thin client.
    2. + *
  2. Create new cache with an existing cache group on server side.
    3. + *
  3. Destroy newly created cache through client.
    4. + *
+ *

+ * Expected: + * Only one cache, initially created within server node is expected. + */ + @Test + public void testCreateOnSrvDestroyOnThinClient() { + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + srv.createCache(cacheConfig()); + + thinClient.destroyCache(CACHE_NAME); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start Rest client.
    2. + *
  2. Create new cache with an existing cache group on server side.
    3. + *
  3. Destroy newly created cache through client.
    4. + *
+ *

+ * Expected: + * Only one cache, initially created within server node is expected. + */ + @Test + public void testCreateOnSrvDestroyOnRestClient() throws Exception { + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + srv.createCache(cacheConfig()); + + destroyCacheWithRestClient(CACHE_NAME); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start Thick client.
    2. + *
  2. Create new cache with an existing cache group on client side.
    3. + *
  3. Destroy newly created cache through server node.
    4. + *
+ *

+ * Expected: + * Only one cache, initially created within server node is expected. + */ + @Test + public void testCreateOnThickClientDestroyOnSrv() { + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + thickClient.createCache(cacheConfig()); + + srv.destroyCache(CACHE_NAME); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start Thin client.
    2. + *
  2. Create new cache with an existing cache group on client side.
    3. + *
  3. Destroy newly created cache through server node.
    4. + *
+ *

+ * Expected: + * Only one cache, initially created within server node is expected. + */ + @Test + public void testCreateOnThinClientSrvDestroyOnSrv() { + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + thinClient.createCache(clientCacheConfig()); + + srv.destroyCache(CACHE_NAME); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start jdbc client.
    2. + *
  2. Create new cache with an existing cache group on client side.
    3. + *
  3. Destroy newly created cache through server node.
    4. + *
+ *

+ * Expected: Only one cache, initially created within server node is expected. + */ + @Test + public void testCreateOnJdbcClientDestroyOnSrv() throws Exception { + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + createCache(jdbcConn, cacheConfig()); + + srv.destroyCache("SQL_PUBLIC_" + CACHE_NAME.toUpperCase()); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start Rest client.
    2. + *
  2. Create new cache with an existing cache group on client side.
    3. + *
  3. Destroy newly created cache through server node.
    4. + *
+ *

+ * Expected: Only one cache, initially created within server node is expected. + */ + @Test + public void testCreateOnRestClientDestroyOnSrv() throws Exception { + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + createCacheWithRestClient(cacheConfig()); + + srv.destroyCache(CACHE_NAME); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start Thick client.
    2. + *
  2. Create new cache with an existing cache group on client side.
    3. + *
  3. Destroy newly created cache through some other, previously created, Thin client node.
    4. + *
+ *

+ * Expected: Only one cache, initially created within server node is expected. + */ + @Test + public void testCreateOnThickClientDestroyThinClient() { + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + thickClient.createCache(cacheConfig()); + + thinClient.destroyCache(CACHE_NAME); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start Thin client.
    2. + *
  2. Create new cache with an existing cache group on client side.
    3. + *
  3. Destroy newly created cache through some other, previously created, Rest client node.
    4. + *
+ *

+ * Expected: Only one cache, initially created within server node is expected. + */ + @Test + public void testCreateOnThinClientSrvDestroyOnRestClient() throws Exception{ + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + thinClient.createCache(clientCacheConfig()); + + destroyCacheWithRestClient(CACHE_NAME); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start Jdbc Thin client.
    2. + *
  2. Create new cache with an existing cache group on client side.
    3. + *
  3. Destroy newly created cache through some other, previously created, Thin client node.
    4. + *
+ *

+ * Expected: Only one cache, initially created within server node is expected. + */ + @Test + public void testCreateOnJdbcClientDestroyOnThinClient() throws Exception { + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + createCache(jdbcConn, cacheConfig()); + + thinClient.destroyCache("SQL_PUBLIC_" + CACHE_NAME.toUpperCase()); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create and destroy caches: + *

+ * Prerequisites: + * Start server node, create 1 cache in a single cache group. + *

+ * Steps: + *

    + *
  1. Start Jdbc Thin client.
    2. + *
  2. Create new cache with an existing cache group on client side.
    3. + *
  3. Destroy newly created cache through some other, previously created, Thick client node.
    4. + *
+ *

+ * Expected: Only one cache, initially created within server node is expected. + * @throws Exception If failed. + */ + @Test + public void testCreateOnRestClientDestroyOnThickClient() throws Exception { + srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); + + createCacheWithRestClient(cacheConfig()); + + thickClient.destroyCache(CACHE_NAME); + + assertEquals(1, srv.cacheNames().size()); + + assertEquals(ANOTHER_CACHE_NAME, srv.cacheNames().iterator().next()); + } + + /** + * Create cache with specified configuration through thin/thick client or jdbc thin. + * + * @param node Cluster node or jdbc connection. + * @param cacheCfg Cache or ClientCache configuration + * @throws SQLException If failed to create cache through Jdbc Thin connection. + */ + private void createCache(AutoCloseable node, Serializable cacheCfg) throws SQLException { + if (node instanceof IgniteClient) + ((IgniteClient)node).createCache((ClientCacheConfiguration)cacheCfg); + else if (node instanceof Ignite) + ((Ignite)node).createCache((CacheConfiguration)cacheCfg); + else if (node instanceof JdbcThinConnection) { + CacheConfiguration jdbcCacheCfg = (CacheConfiguration)cacheCfg; + + srv.addCacheConfiguration(jdbcCacheCfg); + + try (Statement stmt = jdbcConn.createStatement()) { + stmt.execute("CREATE TABLE " + jdbcCacheCfg.getName() + + " (id int, name varchar, primary key (id)) WITH \"template=" + jdbcCacheCfg.getName() + "\""); + } + } + else + fail(" Unexpected node/client type"); + } + + /** + * Create cache with specified configuration through rest client. + * @param cacheCfg Cache configuration. + * @throws Exception If failed. + */ + private void createCacheWithRestClient(CacheConfiguration cacheCfg) throws Exception { + srv.addCacheConfiguration(cacheCfg); + + URLConnection conn = new URL("http://localhost:8080/ignite?cmd=getorcreate&cacheName=" + + cacheCfg.getName() + "&templateName=" + cacheCfg.getName()).openConnection(); + + conn.connect(); + + try (InputStreamReader streamReader = new InputStreamReader(conn.getInputStream())) { + ObjectMapper objMapper = new ObjectMapper(); + Map myMap = objMapper.readValue(streamReader, + new TypeReference>() { + }); + + log.info("Version command response is: " + myMap); + + assertTrue(myMap.containsKey("response")); + assertEquals(0, myMap.get("successStatus")); + } + } + + /** + * Destroy cache from within rest client. + * @param cacheName Cache name. + * @throws Exception If failed. + */ + private void destroyCacheWithRestClient(String cacheName) throws Exception { + URLConnection conn = new URL("http://localhost:8080/ignite?cmd=destcache&cacheName=" + cacheName). + openConnection(); + + conn.connect(); + + try (InputStreamReader streamReader = new InputStreamReader(conn.getInputStream())) { + ObjectMapper objMapper = new ObjectMapper(); + Map myMap = objMapper.readValue(streamReader, + new TypeReference>() { + }); + + log.info("Version command response is: " + myMap); + + assertTrue(myMap.containsKey("response")); + assertEquals(0, myMap.get("successStatus")); + } + } + + /** + * @return Default client cache configuration. + */ + private ClientCacheConfiguration clientCacheConfig() { + return new ClientCacheConfiguration(). + setGroupName(CACHE_GROUP_NAME). + setName(CACHE_NAME). + setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL). + setCacheMode(CacheMode.PARTITIONED); + } + + /** + * @return Default cache configuration. + */ + private CacheConfiguration cacheConfig() { + return new CacheConfiguration(). + setGroupName(CACHE_GROUP_NAME). + setName(CACHE_NAME). + setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL). + setCacheMode(CacheMode.PARTITIONED); + } + + /** + * @return Default cache configuration without cache group. + */ + private CacheConfiguration cacheConfigWithoutCacheGroup() { + return new CacheConfiguration(). + setName(CACHE_NAME). + setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL). + setCacheMode(CacheMode.PARTITIONED); + } +} From 407c64813b90f8c0b6a13d22b1b2ebfe9426721b Mon Sep 17 00:00:00 2001 From: sanpwc Date: Thu, 17 Dec 2020 06:26:55 +0300 Subject: [PATCH 2/4] IGNITE-13868 Tests added for create caches simultaneously in same non-existing cache group led to NPE. --- ...eCreationDestructionWileTopologyChangeTest.java | 14 ++++++++------ .../ClientSizeCacheCreationDestructionTest.java | 14 ++++++++------ .../client/suite/IgniteClientTestSuite.java | 7 ++++++- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java b/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java index 592b49d2ba662..af42ad4600f53 100644 --- a/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java @@ -1,11 +1,12 @@ /* - * Copyright 2019 GridGain Systems, Inc. and Contributors. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the GridGain Community Edition License (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.ignite.common; import org.apache.ignite.internal.IgniteInternalFuture; diff --git a/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java b/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java index f61bc9a22cec1..e45ca16a12c7f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java @@ -1,11 +1,12 @@ /* - * Copyright 2019 GridGain Systems, Inc. and Contributors. + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Licensed under the GridGain Community Edition License (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.gridgain.com/products/software/community-edition/gridgain-community-edition-license + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.ignite.common; import java.io.IOException; diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java index 7408f4e3e40e1..0058bac1a4ead 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java @@ -17,6 +17,8 @@ package org.apache.ignite.internal.client.suite; +import org.apache.ignite.common.ClientSideCacheCreationDestructionWileTopologyChangeTest; +import org.apache.ignite.common.ClientSizeCacheCreationDestructionTest; import org.apache.ignite.internal.IgniteClientFailuresTest; import org.apache.ignite.internal.TaskEventSubjectIdSelfTest; import org.apache.ignite.internal.client.ClientDefaultCacheSelfTest; @@ -175,7 +177,10 @@ // SSL params. ClientSslParametersTest.class, - IgniteClientFailuresTest.class + IgniteClientFailuresTest.class, + + ClientSizeCacheCreationDestructionTest.class, + ClientSideCacheCreationDestructionWileTopologyChangeTest.class }) public class IgniteClientTestSuite { } From 6e476335935cd397379e9f2424946aa21f088717 Mon Sep 17 00:00:00 2001 From: sanpwc Date: Thu, 17 Dec 2020 07:08:54 +0300 Subject: [PATCH 3/4] IGNITE-13868 --- ...ntSideCacheCreationDestructionWileTopologyChangeTest.java | 5 ++--- .../common/ClientSizeCacheCreationDestructionTest.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java b/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java index af42ad4600f53..3f0f622d9ae81 100644 --- a/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/common/ClientSideCacheCreationDestructionWileTopologyChangeTest.java @@ -17,11 +17,10 @@ package org.apache.ignite.common; -import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.testframework.GridTestUtils; - import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.testframework.GridTestUtils; /** * {@inheritDoc} With topology events in parallel diff --git a/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java b/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java index e45ca16a12c7f..66d8d679aff70 100644 --- a/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java @@ -1064,7 +1064,7 @@ public void testCreateOnThickClientDestroyThinClient() { * Expected: Only one cache, initially created within server node is expected. */ @Test - public void testCreateOnThinClientSrvDestroyOnRestClient() throws Exception{ + public void testCreateOnThinClientSrvDestroyOnRestClient() throws Exception { srv.createCache(cacheConfig().setName(ANOTHER_CACHE_NAME)); thinClient.createCache(clientCacheConfig()); From eeaa7348425c842604045099d20800fabc77fa59 Mon Sep 17 00:00:00 2001 From: sanpwc Date: Thu, 17 Dec 2020 14:53:42 +0300 Subject: [PATCH 4/4] IGNITE-13868 --- .../common/ClientSizeCacheCreationDestructionTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java b/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java index 66d8d679aff70..ab657de1506df 100644 --- a/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/common/ClientSizeCacheCreationDestructionTest.java @@ -37,13 +37,13 @@ import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.client.ClientCacheConfiguration; +import org.apache.ignite.client.ClientException; import org.apache.ignite.client.IgniteClient; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.ClientConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.internal.client.thin.ClientServerError; import org.apache.ignite.internal.jdbc.thin.JdbcThinConnection; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; @@ -469,7 +469,7 @@ public void testFewCachesCreatedInChainWithCacheGroupNameEqualsFirstCacheNameThi *

    *
  1. Start server node, create 4 different caches without cache groups.
    2. *
  2. Start Thin client node, try to create cache with cache group with a name == first cache name.
    3. - *
  3. {@code ClientServerError} expected with message: + *
  4. {@code ClientException} expected with message: * 'Failed to start cache. Cache group name conflict with existing cache (change group name)'.
    5. *
* @throws Exception If failed. @@ -486,7 +486,7 @@ public void testFewCachesCreatedInChainWithCacheGroupNameEqualsFirstCacheNameThi return null; }, - ClientServerError.class, + ClientException.class, "Failed to start cache. Cache group name conflict with existing cache (change group name)"); } @@ -574,7 +574,7 @@ public void testFewCachesCreatedInChainWithDifferentConfigThickClient() throws E *
  • Start server node, create 4 different caches with cache groups.
    • *
  • Start Thin client node, try to create extra cache within same cache group but with different * config.
    • - *
  • {@code ClientServerError} expected + *
  • {@code ClientException} expected * with message 'Backups mismatch for caches related to the same group'.
    • * * @throws Exception If failed. @@ -591,7 +591,7 @@ public void testFewCachesCreatedInChainWithDifferentConfigThinClient() throws Ex return null; }, - ClientServerError.class, + ClientException.class, "Backups mismatch for caches related to the same group"); }