ivandasch commented on code in PR #10537: URL: https://github.com/apache/ignite/pull/10537#discussion_r1107143914
########## modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessTest.java: ########## @@ -0,0 +1,162 @@ +/* + * 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.util; + +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.function.BiFunction; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.failure.StopNodeFailureHandler; +import org.apache.ignite.internal.util.distributed.DistributedProcess; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.F; +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.internal.util.distributed.DistributedProcess.DistributedProcessType.TEST_PROCESS; +import static org.apache.ignite.testframework.GridTestUtils.runAsync; + +/** */ +@RunWith(Parameterized.class) +public class DistributedProcessTest extends GridCommonAbstractTest { + /** */ + private static final int SRV_NODES = 3; + + /** If {@code true} then client fails, otherwise server node fails. */ + @Parameterized.Parameter + public boolean failCln; + + /** */ + @Parameterized.Parameters(name = "failClient={0}") + public static Iterable<Boolean> params() { + return F.asList(false, true); + } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String instanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(instanceName); + + cfg.setFailureHandler(new StopNodeFailureHandler()); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startGrids(SRV_NODES); + + startClientGrid(SRV_NODES); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() { + stopAllGrids(); + } + + /** */ + @Test + public void testBackgroundExecFailureHandled() throws Exception { + checkDistributedProcess((n, latch) -> + new DistributedProcess<>(grid(n).context(), TEST_PROCESS, + req -> runAsync(() -> { + failOnNode(n); // Fails processing request in a spawned thread. + + return 0; + }), + (id, res, err) -> { + if (failCln) + assertEquals(SRV_NODES, res.values().size()); + else { + assertEquals(SRV_NODES - 1, res.values().size()); + assertEquals(1, err.size()); + assertTrue(err.get(grid(1).localNode().id()) instanceof AssertionError); + } + + latch.countDown(); + })); + } + + /** */ + @Test + public void testExecFailureHandled() throws Exception { + checkDistributedProcess((n, latch) -> + new DistributedProcess<>(grid(n).context(), TEST_PROCESS, + req -> { + failOnNode(n); // Fails processing request in the discovery thread. + + return new GridFinishedFuture<>(0); + }, + (id, res, err) -> { + if (failCln) + assertEquals(SRV_NODES, res.values().size()); + else { + assertEquals(SRV_NODES - 1, res.values().size()); + assertEquals(1, err.size()); + assertTrue(err.get(grid(1).localNode().id()) instanceof AssertionError); + } + + latch.countDown(); + })); + } + + /** */ + @Test + public void testFinishFailureHandled() throws Exception { + checkDistributedProcess((n, latch) -> + new DistributedProcess<>(grid(n).context(), TEST_PROCESS, + req -> new GridFinishedFuture<>(0), + (uuid, res, err) -> { + assertEquals(SRV_NODES, res.values().size()); + latch.countDown(); + + failOnNode(n); + })); + } + + /** */ + private void checkDistributedProcess( + BiFunction<Integer, CountDownLatch, DistributedProcess<Integer, Integer>> processFactory + ) throws Exception { + DistributedProcess<Integer, Integer> process = null; + + CountDownLatch latch = new CountDownLatch(SRV_NODES + 1); + + for (int n = SRV_NODES; n >= 0; n--) + process = processFactory.apply(n, latch); + + process.start(UUID.randomUUID(), 0); + + assertTrue(latch.await(30, TimeUnit.SECONDS)); Review Comment: It seems that this timeout is too big. What about to reduce it? ########## modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessTest.java: ########## @@ -0,0 +1,162 @@ +/* + * 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.util; + +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.function.BiFunction; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.failure.StopNodeFailureHandler; +import org.apache.ignite.internal.util.distributed.DistributedProcess; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.F; +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.internal.util.distributed.DistributedProcess.DistributedProcessType.TEST_PROCESS; +import static org.apache.ignite.testframework.GridTestUtils.runAsync; + +/** */ +@RunWith(Parameterized.class) +public class DistributedProcessTest extends GridCommonAbstractTest { + /** */ + private static final int SRV_NODES = 3; + + /** If {@code true} then client fails, otherwise server node fails. */ + @Parameterized.Parameter + public boolean failCln; Review Comment: Seems that just `failClient` is better. At first glance it looks like `failCnt` ########## modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessTest.java: ########## @@ -0,0 +1,162 @@ +/* + * 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.util; + +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.function.BiFunction; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.failure.StopNodeFailureHandler; +import org.apache.ignite.internal.util.distributed.DistributedProcess; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.F; +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.internal.util.distributed.DistributedProcess.DistributedProcessType.TEST_PROCESS; +import static org.apache.ignite.testframework.GridTestUtils.runAsync; + +/** */ +@RunWith(Parameterized.class) +public class DistributedProcessTest extends GridCommonAbstractTest { + /** */ + private static final int SRV_NODES = 3; + + /** If {@code true} then client fails, otherwise server node fails. */ + @Parameterized.Parameter + public boolean failCln; + + /** */ + @Parameterized.Parameters(name = "failClient={0}") + public static Iterable<Boolean> params() { + return F.asList(false, true); + } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String instanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(instanceName); + + cfg.setFailureHandler(new StopNodeFailureHandler()); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startGrids(SRV_NODES); + + startClientGrid(SRV_NODES); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() { + stopAllGrids(); + } + + /** */ + @Test + public void testBackgroundExecFailureHandled() throws Exception { + checkDistributedProcess((n, latch) -> + new DistributedProcess<>(grid(n).context(), TEST_PROCESS, + req -> runAsync(() -> { + failOnNode(n); // Fails processing request in a spawned thread. + + return 0; + }), + (id, res, err) -> { + if (failCln) + assertEquals(SRV_NODES, res.values().size()); + else { + assertEquals(SRV_NODES - 1, res.values().size()); + assertEquals(1, err.size()); + assertTrue(err.get(grid(1).localNode().id()) instanceof AssertionError); + } + + latch.countDown(); + })); + } + + /** */ + @Test + public void testExecFailureHandled() throws Exception { + checkDistributedProcess((n, latch) -> + new DistributedProcess<>(grid(n).context(), TEST_PROCESS, + req -> { + failOnNode(n); // Fails processing request in the discovery thread. + + return new GridFinishedFuture<>(0); + }, + (id, res, err) -> { + if (failCln) + assertEquals(SRV_NODES, res.values().size()); + else { + assertEquals(SRV_NODES - 1, res.values().size()); + assertEquals(1, err.size()); + assertTrue(err.get(grid(1).localNode().id()) instanceof AssertionError); + } + + latch.countDown(); + })); + } + + /** */ + @Test + public void testFinishFailureHandled() throws Exception { + checkDistributedProcess((n, latch) -> + new DistributedProcess<>(grid(n).context(), TEST_PROCESS, + req -> new GridFinishedFuture<>(0), + (uuid, res, err) -> { + assertEquals(SRV_NODES, res.values().size()); + latch.countDown(); + + failOnNode(n); + })); + } + + /** */ + private void checkDistributedProcess( + BiFunction<Integer, CountDownLatch, DistributedProcess<Integer, Integer>> processFactory + ) throws Exception { + DistributedProcess<Integer, Integer> process = null; + + CountDownLatch latch = new CountDownLatch(SRV_NODES + 1); + + for (int n = SRV_NODES; n >= 0; n--) + process = processFactory.apply(n, latch); Review Comment: It seems that a bunch of processes is created here but only one of them actually is started ########## modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessTest.java: ########## @@ -0,0 +1,162 @@ +/* + * 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.util; + +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.function.BiFunction; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.failure.StopNodeFailureHandler; +import org.apache.ignite.internal.util.distributed.DistributedProcess; +import org.apache.ignite.internal.util.future.GridFinishedFuture; +import org.apache.ignite.internal.util.typedef.F; +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.internal.util.distributed.DistributedProcess.DistributedProcessType.TEST_PROCESS; +import static org.apache.ignite.testframework.GridTestUtils.runAsync; + +/** */ +@RunWith(Parameterized.class) +public class DistributedProcessTest extends GridCommonAbstractTest { + /** */ + private static final int SRV_NODES = 3; + + /** If {@code true} then client fails, otherwise server node fails. */ + @Parameterized.Parameter + public boolean failCln; + + /** */ + @Parameterized.Parameters(name = "failClient={0}") + public static Iterable<Boolean> params() { + return F.asList(false, true); + } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String instanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(instanceName); + + cfg.setFailureHandler(new StopNodeFailureHandler()); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startGrids(SRV_NODES); + + startClientGrid(SRV_NODES); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() { + stopAllGrids(); + } + + /** */ + @Test + public void testBackgroundExecFailureHandled() throws Exception { + checkDistributedProcess((n, latch) -> + new DistributedProcess<>(grid(n).context(), TEST_PROCESS, + req -> runAsync(() -> { + failOnNode(n); // Fails processing request in a spawned thread. + + return 0; + }), + (id, res, err) -> { + if (failCln) + assertEquals(SRV_NODES, res.values().size()); + else { + assertEquals(SRV_NODES - 1, res.values().size()); + assertEquals(1, err.size()); + assertTrue(err.get(grid(1).localNode().id()) instanceof AssertionError); + } + + latch.countDown(); + })); + } + + /** */ + @Test + public void testExecFailureHandled() throws Exception { + checkDistributedProcess((n, latch) -> + new DistributedProcess<>(grid(n).context(), TEST_PROCESS, + req -> { + failOnNode(n); // Fails processing request in the discovery thread. + + return new GridFinishedFuture<>(0); + }, + (id, res, err) -> { + if (failCln) + assertEquals(SRV_NODES, res.values().size()); + else { + assertEquals(SRV_NODES - 1, res.values().size()); + assertEquals(1, err.size()); + assertTrue(err.get(grid(1).localNode().id()) instanceof AssertionError); + } + + latch.countDown(); + })); + } + + /** */ + @Test + public void testFinishFailureHandled() throws Exception { + checkDistributedProcess((n, latch) -> + new DistributedProcess<>(grid(n).context(), TEST_PROCESS, + req -> new GridFinishedFuture<>(0), + (uuid, res, err) -> { + assertEquals(SRV_NODES, res.values().size()); + latch.countDown(); + + failOnNode(n); + })); + } + + /** */ + private void checkDistributedProcess( + BiFunction<Integer, CountDownLatch, DistributedProcess<Integer, Integer>> processFactory + ) throws Exception { + DistributedProcess<Integer, Integer> process = null; + + CountDownLatch latch = new CountDownLatch(SRV_NODES + 1); + + for (int n = SRV_NODES; n >= 0; n--) + process = processFactory.apply(n, latch); + + process.start(UUID.randomUUID(), 0); + + assertTrue(latch.await(30, TimeUnit.SECONDS)); + + // Just checks that node is alive. + grid(1).cluster().state(ClusterState.INACTIVE); + + awaitPartitionMapExchange(); + + checkTopology(SRV_NODES + 1); + } + + /** Checks whether to fail on specified node. */ + private void failOnNode(int nodeIdx) { + assert (failCln && nodeIdx != SRV_NODES) || nodeIdx != 1; Review Comment: Looks quite cryptic. Let's set a client id to `CLIENT_NODE_IDX` -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
