alex-plekhanov commented on code in PR #11824: URL: https://github.com/apache/ignite/pull/11824#discussion_r1955748506
########## modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/RejoinWithLostDynamicDdlTest.java: ########## @@ -0,0 +1,232 @@ +/* + * 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 + * + * 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, + * 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.internal.processors.cache.index; + +import java.io.File; +import java.util.Collection; +import java.util.List; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.cache.CacheWriteSynchronizationMode; +import org.apache.ignite.cache.query.SqlFieldsQuery; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.processors.query.GridQueryProcessor; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import static org.apache.ignite.testframework.GridTestUtils.cartesianProduct; + +/** Tests the scenario when a node rejoins cluster with lost knowladge of previously created dynamic schema. */ +@RunWith(Parameterized.class) +public class RejoinWithLostDynamicDdlTest extends GridCommonAbstractTest { + /** */ + private static final int SERVERS_CNT = 2; + + /** */ + private static final int LOAD_CNT = 100; + + /** */ + private boolean persistence; + + /** Static cache configurations. */ + private CacheConfiguration<?, ?>[] staticCaches; + + /** */ + private IgniteEx sqlClient; + + /** Grid to test (restart). */ + @Parameterized.Parameter + public int gridToRestart; + + /** Eanables create-if-not-exist table with the rejoining. */ + @Parameterized.Parameter(1) + public boolean recreateTable; + + /** */ + @Parameterized.Parameters(name = "gridToRestart={0}, recreateTable={1}") + public static Collection<?> runConfig() { + // Restart coordinator, another server node and client. + return cartesianProduct( + F.asList(0, 1, SERVERS_CNT), + F.asList(false, true) + ); + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + super.beforeTest(); + + cleanPersistenceDir(); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + super.afterTest(); + + stopAllGrids(); + + cleanPersistenceDir(); + } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + + cfg.setDataStorageConfiguration(new DataStorageConfiguration() + .setDefaultDataRegionConfiguration(new DataRegionConfiguration().setPersistenceEnabled(persistence))); + + if (!F.isEmpty(staticCaches)) + cfg.setCacheConfiguration(staticCaches); + + return cfg; + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaInmemoryActive() throws Exception { + testRejoinWithLostDynamicSchema(false, true, false); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaInmemoryInactive() throws Exception { + testRejoinWithLostDynamicSchema(false, false, false); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaPersistentActive() throws Exception { + testRejoinWithLostDynamicSchema(true, true, false); + } + + /** */ + @Test + public void testRejoinWithLostLostDynamicTablePersistentInactive() throws Exception { + testRejoinWithLostDynamicSchema(true, false, false); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaPersistentActiveClear() throws Exception { + testRejoinWithLostDynamicSchema(true, true, true); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaPersistentInactiveClear() throws Exception { + testRejoinWithLostDynamicSchema(true, false, true); + } + + /** + * Tests the scenario when a node rejoins cluster with lost knowladge of previously created dynamic table over + * a predefined cache in {@link IgniteConfiguration}. + * + * @param persistence Flag to test with persistence or in-memory cluster. + * @param rejoinActive Flag to rejoin to active or inactive cluster. + * @param clearData Flag to clear test node's persistent data before rejoining. Efficient with enabled {@code persistence}. + */ + private void testRejoinWithLostDynamicSchema( + boolean persistence, + boolean rejoinActive, + boolean clearData + ) throws Exception { + this.persistence = persistence; + + CacheConfiguration<?, ?> cacheCfg = new CacheConfiguration<>("STATIC_CACHE") + .setBackups(SERVERS_CNT - 1) + .setCacheMode(CacheMode.PARTITIONED) + .setAtomicityMode(CacheAtomicityMode.ATOMIC) + .setWriteSynchronizationMode(CacheWriteSynchronizationMode.PRIMARY_SYNC); + + staticCaches = new CacheConfiguration<?, ?>[] {cacheCfg}; + + startGrids(SERVERS_CNT); + + sqlClient = startClientGrid(G.allGrids().size()); + + if (persistence) + grid(0).cluster().state(ClusterState.ACTIVE); + + cacheCfg.setName("DYN_CACHE"); + + sqlClient.createCache(cacheCfg); + + awaitPartitionMapExchange(); + + sql("CREATE TABLE STATIC_TBL(ID INTEGER PRIMARY KEY, VAL VARCHAR) WITH \"CACHE_NAME=STATIC_CACHE\""); + sql("CREATE TABLE DYN_TBL(ID INTEGER PRIMARY KEY, VAL VARCHAR) WITH \"CACHE_NAME=DYN_CACHE\""); + + assertEquals(0, sql("SELECT * FROM STATIC_TBL").size()); + assertEquals(0, sql("SELECT * FROM DYN_TBL").size()); + + File persistPath = grid(gridToRestart).context().pdsFolderResolver().fileTree().nodeStorage(); + + stopGrid(gridToRestart); + + if (clearData) { + if (log.isDebugEnabled()) + log.debug("Clearing " + persistPath); + + U.delete(persistPath); Review Comment: `cleanPersistenceDir(getTestIgniteInstanceName(gridToRestart))`? (but `consistentId` should be configured in `getConfigureation` in this case) ########## modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/RejoinWithLostDynamicDdlTest.java: ########## @@ -0,0 +1,232 @@ +/* + * 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 + * + * 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, + * 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.internal.processors.cache.index; + +import java.io.File; +import java.util.Collection; +import java.util.List; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.cache.CacheWriteSynchronizationMode; +import org.apache.ignite.cache.query.SqlFieldsQuery; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.processors.query.GridQueryProcessor; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import static org.apache.ignite.testframework.GridTestUtils.cartesianProduct; + +/** Tests the scenario when a node rejoins cluster with lost knowladge of previously created dynamic schema. */ +@RunWith(Parameterized.class) +public class RejoinWithLostDynamicDdlTest extends GridCommonAbstractTest { + /** */ + private static final int SERVERS_CNT = 2; + + /** */ + private static final int LOAD_CNT = 100; + + /** */ + private boolean persistence; + + /** Static cache configurations. */ + private CacheConfiguration<?, ?>[] staticCaches; + + /** */ + private IgniteEx sqlClient; + + /** Grid to test (restart). */ + @Parameterized.Parameter + public int gridToRestart; + + /** Eanables create-if-not-exist table with the rejoining. */ Review Comment: Eanables -> Enables ########## modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/RejoinWithLostDynamicDdlTest.java: ########## @@ -0,0 +1,232 @@ +/* + * 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 + * + * 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, + * 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.internal.processors.cache.index; + +import java.io.File; +import java.util.Collection; +import java.util.List; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.cache.CacheWriteSynchronizationMode; +import org.apache.ignite.cache.query.SqlFieldsQuery; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.processors.query.GridQueryProcessor; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import static org.apache.ignite.testframework.GridTestUtils.cartesianProduct; + +/** Tests the scenario when a node rejoins cluster with lost knowladge of previously created dynamic schema. */ +@RunWith(Parameterized.class) +public class RejoinWithLostDynamicDdlTest extends GridCommonAbstractTest { + /** */ + private static final int SERVERS_CNT = 2; + + /** */ + private static final int LOAD_CNT = 100; + + /** */ + private boolean persistence; + + /** Static cache configurations. */ + private CacheConfiguration<?, ?>[] staticCaches; + + /** */ + private IgniteEx sqlClient; + + /** Grid to test (restart). */ + @Parameterized.Parameter + public int gridToRestart; + + /** Eanables create-if-not-exist table with the rejoining. */ + @Parameterized.Parameter(1) + public boolean recreateTable; + + /** */ + @Parameterized.Parameters(name = "gridToRestart={0}, recreateTable={1}") + public static Collection<?> runConfig() { + // Restart coordinator, another server node and client. + return cartesianProduct( + F.asList(0, 1, SERVERS_CNT), + F.asList(false, true) + ); + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + super.beforeTest(); + + cleanPersistenceDir(); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + super.afterTest(); + + stopAllGrids(); + + cleanPersistenceDir(); + } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + + cfg.setDataStorageConfiguration(new DataStorageConfiguration() + .setDefaultDataRegionConfiguration(new DataRegionConfiguration().setPersistenceEnabled(persistence))); + + if (!F.isEmpty(staticCaches)) + cfg.setCacheConfiguration(staticCaches); + + return cfg; + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaInmemoryActive() throws Exception { + testRejoinWithLostDynamicSchema(false, true, false); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaInmemoryInactive() throws Exception { + testRejoinWithLostDynamicSchema(false, false, false); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaPersistentActive() throws Exception { + testRejoinWithLostDynamicSchema(true, true, false); + } + + /** */ + @Test + public void testRejoinWithLostLostDynamicTablePersistentInactive() throws Exception { + testRejoinWithLostDynamicSchema(true, false, false); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaPersistentActiveClear() throws Exception { + testRejoinWithLostDynamicSchema(true, true, true); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaPersistentInactiveClear() throws Exception { + testRejoinWithLostDynamicSchema(true, false, true); + } + + /** + * Tests the scenario when a node rejoins cluster with lost knowladge of previously created dynamic table over + * a predefined cache in {@link IgniteConfiguration}. + * + * @param persistence Flag to test with persistence or in-memory cluster. + * @param rejoinActive Flag to rejoin to active or inactive cluster. + * @param clearData Flag to clear test node's persistent data before rejoining. Efficient with enabled {@code persistence}. + */ + private void testRejoinWithLostDynamicSchema( + boolean persistence, + boolean rejoinActive, + boolean clearData + ) throws Exception { + this.persistence = persistence; + + CacheConfiguration<?, ?> cacheCfg = new CacheConfiguration<>("STATIC_CACHE") + .setBackups(SERVERS_CNT - 1) + .setCacheMode(CacheMode.PARTITIONED) + .setAtomicityMode(CacheAtomicityMode.ATOMIC) + .setWriteSynchronizationMode(CacheWriteSynchronizationMode.PRIMARY_SYNC); + + staticCaches = new CacheConfiguration<?, ?>[] {cacheCfg}; Review Comment: Used only once, can be moved to `getConfiguration` ########## modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/RejoinWithLostDynamicDdlTest.java: ########## @@ -0,0 +1,232 @@ +/* + * 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 + * + * 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, + * 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.internal.processors.cache.index; + +import java.io.File; +import java.util.Collection; +import java.util.List; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.cache.CacheWriteSynchronizationMode; +import org.apache.ignite.cache.query.SqlFieldsQuery; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.processors.query.GridQueryProcessor; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.G; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import static org.apache.ignite.testframework.GridTestUtils.cartesianProduct; + +/** Tests the scenario when a node rejoins cluster with lost knowladge of previously created dynamic schema. */ +@RunWith(Parameterized.class) +public class RejoinWithLostDynamicDdlTest extends GridCommonAbstractTest { + /** */ + private static final int SERVERS_CNT = 2; + + /** */ + private static final int LOAD_CNT = 100; + + /** */ + private boolean persistence; + + /** Static cache configurations. */ + private CacheConfiguration<?, ?>[] staticCaches; + + /** */ + private IgniteEx sqlClient; + + /** Grid to test (restart). */ + @Parameterized.Parameter + public int gridToRestart; + + /** Eanables create-if-not-exist table with the rejoining. */ + @Parameterized.Parameter(1) + public boolean recreateTable; + + /** */ + @Parameterized.Parameters(name = "gridToRestart={0}, recreateTable={1}") + public static Collection<?> runConfig() { + // Restart coordinator, another server node and client. + return cartesianProduct( + F.asList(0, 1, SERVERS_CNT), + F.asList(false, true) + ); + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + super.beforeTest(); + + cleanPersistenceDir(); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + super.afterTest(); + + stopAllGrids(); + + cleanPersistenceDir(); + } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + + cfg.setDataStorageConfiguration(new DataStorageConfiguration() + .setDefaultDataRegionConfiguration(new DataRegionConfiguration().setPersistenceEnabled(persistence))); + + if (!F.isEmpty(staticCaches)) + cfg.setCacheConfiguration(staticCaches); + + return cfg; + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaInmemoryActive() throws Exception { + testRejoinWithLostDynamicSchema(false, true, false); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaInmemoryInactive() throws Exception { + testRejoinWithLostDynamicSchema(false, false, false); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaPersistentActive() throws Exception { + testRejoinWithLostDynamicSchema(true, true, false); + } + + /** */ + @Test + public void testRejoinWithLostLostDynamicTablePersistentInactive() throws Exception { + testRejoinWithLostDynamicSchema(true, false, false); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaPersistentActiveClear() throws Exception { + testRejoinWithLostDynamicSchema(true, true, true); + } + + /** */ + @Test + public void testRejoinWithLostDynamicSchemaPersistentInactiveClear() throws Exception { + testRejoinWithLostDynamicSchema(true, false, true); + } + + /** + * Tests the scenario when a node rejoins cluster with lost knowladge of previously created dynamic table over + * a predefined cache in {@link IgniteConfiguration}. + * + * @param persistence Flag to test with persistence or in-memory cluster. + * @param rejoinActive Flag to rejoin to active or inactive cluster. + * @param clearData Flag to clear test node's persistent data before rejoining. Efficient with enabled {@code persistence}. + */ + private void testRejoinWithLostDynamicSchema( + boolean persistence, + boolean rejoinActive, + boolean clearData + ) throws Exception { + this.persistence = persistence; + + CacheConfiguration<?, ?> cacheCfg = new CacheConfiguration<>("STATIC_CACHE") + .setBackups(SERVERS_CNT - 1) + .setCacheMode(CacheMode.PARTITIONED) + .setAtomicityMode(CacheAtomicityMode.ATOMIC) + .setWriteSynchronizationMode(CacheWriteSynchronizationMode.PRIMARY_SYNC); + + staticCaches = new CacheConfiguration<?, ?>[] {cacheCfg}; + + startGrids(SERVERS_CNT); + + sqlClient = startClientGrid(G.allGrids().size()); + + if (persistence) + grid(0).cluster().state(ClusterState.ACTIVE); + + cacheCfg.setName("DYN_CACHE"); + + sqlClient.createCache(cacheCfg); + + awaitPartitionMapExchange(); + + sql("CREATE TABLE STATIC_TBL(ID INTEGER PRIMARY KEY, VAL VARCHAR) WITH \"CACHE_NAME=STATIC_CACHE\""); + sql("CREATE TABLE DYN_TBL(ID INTEGER PRIMARY KEY, VAL VARCHAR) WITH \"CACHE_NAME=DYN_CACHE\""); + + assertEquals(0, sql("SELECT * FROM STATIC_TBL").size()); + assertEquals(0, sql("SELECT * FROM DYN_TBL").size()); + + File persistPath = grid(gridToRestart).context().pdsFolderResolver().fileTree().nodeStorage(); + + stopGrid(gridToRestart); + + if (clearData) { + if (log.isDebugEnabled()) + log.debug("Clearing " + persistPath); + + U.delete(persistPath); + } + + if (!rejoinActive) + grid(gridToRestart == SERVERS_CNT ? 1 : SERVERS_CNT).cluster().state(ClusterState.INACTIVE); + + startGrid(gridToRestart); + + if (!rejoinActive) + grid(gridToRestart == SERVERS_CNT ? 1 : SERVERS_CNT).cluster().state(ClusterState.ACTIVE); + + sqlClient = grid(gridToRestart); + + if (recreateTable) { + sql("CREATE TABLE IF NOT EXISTS STATIC_TBL(ID INTEGER PRIMARY KEY, VAL VARCHAR) WITH \"CACHE_NAME=STATIC_CACHE\""); + sql("CREATE TABLE IF NOT EXISTS DYN_TBL(ID INTEGER PRIMARY KEY, VAL VARCHAR) WITH \"CACHE_NAME=DYN_CACHE\""); + } + + for (int i = 0; i < LOAD_CNT; ++i) { + assertEquals(1, sql("INSERT INTO STATIC_TBL VALUES(" + i + ", 'value_" + i + "')").size()); + assertEquals(1, sql("INSERT INTO DYN_TBL VALUES(" + i + ", 'value_" + i + "')").size()); Review Comment: No need to assert size for INSERT -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@ignite.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
