You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2024/12/10 12:57:16 UTC
(ignite) branch master updated: IGNITE-23932 Remove setForceServerMode from GridTaskFailoverAffinityRunTest (#11722)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new cbd8973151b IGNITE-23932 Remove setForceServerMode from GridTaskFailoverAffinityRunTest (#11722)
cbd8973151b is described below
commit cbd8973151bcd958d133636f2b82d041eb24f993
Author: Nikolay <ni...@apache.org>
AuthorDate: Tue Dec 10 15:57:08 2024 +0300
IGNITE-23932 Remove setForceServerMode from GridTaskFailoverAffinityRunTest (#11722)
---
.../internal/GridTaskFailoverAffinityRunTest.java | 30 +++++++++++++---------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
index 64e340c235b..bc946bc5b11 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskFailoverAffinityRunTest.java
@@ -28,7 +28,6 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.GridTestUtils.SF;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -42,6 +41,9 @@ import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
*
*/
public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
+ /** */
+ private static final int GRID_CNT = 4;
+
/** */
private boolean clientMode;
@@ -51,13 +53,7 @@ public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
- boolean client = clientMode && igniteInstanceName.equals(getTestIgniteInstanceName(0));
-
- if (client) {
- cfg.setClientMode(true);
-
- ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true);
- }
+ cfg.setClientMode(clientMode && igniteInstanceName.equals(getTestIgniteInstanceName(GRID_CNT)));
CacheConfiguration ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME);
@@ -102,13 +98,14 @@ public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void nodeRestart() throws Exception {
- startGridsMultiThreaded(4);
+ // +1 for extra client node.
+ startGridsMultiThreaded(GRID_CNT + 1);
- assertEquals((Boolean)clientMode, grid(0).configuration().isClientMode());
+ assertEquals((Boolean)clientMode, client().configuration().isClientMode());
final AtomicBoolean stop = new AtomicBoolean();
- final AtomicInteger gridIdx = new AtomicInteger(1);
+ final AtomicInteger gridIdx = new AtomicInteger(0);
final long stopTime = System.currentTimeMillis() + SF.applyLB(30_000, 10_000);
@@ -116,6 +113,10 @@ public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
@Override public Object call() throws Exception {
int grid = gridIdx.getAndIncrement();
+ // Don't stop client node.
+ if (grid == GRID_CNT)
+ grid = gridIdx.getAndIncrement();
+
while (!stop.get() && System.currentTimeMillis() < stopTime) {
stopGrid(grid);
@@ -131,7 +132,7 @@ public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
Collection<IgniteFuture<?>> futs = new ArrayList<>(1000);
for (int i = 0; i < 1000; i++) {
- IgniteFuture<?> fut0 = grid(0).compute().affinityCallAsync(DEFAULT_CACHE_NAME, i, new TestJob());
+ IgniteFuture<?> fut0 = client().compute().affinityCallAsync(DEFAULT_CACHE_NAME, i, new TestJob());
assertNotNull(fut0);
@@ -155,6 +156,11 @@ public class GridTaskFailoverAffinityRunTest extends GridCommonAbstractTest {
}
}
+ /** */
+ private IgniteEx client() {
+ return grid(GRID_CNT);
+ }
+
/**
*
*/