Skip to content

IGNITE-23991 Remove setForceServerMode from CacheLateAffinityAssignmentTest #11740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nizhikov merged 3 commits into from
Dec 14, 2024
Merged

IGNITE-23991 Remove setForceServerMode from CacheLateAffinityAssignmentTest #11740

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
640c7d3
IGNITE-23990 Remove setForceServerMode from CacheAffinityCallSelfTest
nizhikov Dec 13, 2024
3025d99
IGNITE-23990 Remove setForceServerMode from CacheLateAffinityAssignme…
nizhikov Dec 14, 2024
d0f233b
Merge branch 'master' into IGNITE-23991
nizhikov Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 0 additions & 55 deletions .../apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@
*
*/
public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest {
/** */
private boolean forceSrvMode;

/** */
private static final String CACHE_NAME1 = "testCache1";

Expand Down Expand Up @@ -158,7 +155,6 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest {

TcpDiscoverySpi discoSpi = (TcpDiscoverySpi)cfg.getDiscoverySpi();

discoSpi.setForceServerMode(forceSrvMode);
discoSpi.setNetworkTimeout(60_000);

cfg.setClientFailureDetectionTimeout(100000);
Expand Down Expand Up @@ -1949,62 +1945,11 @@ public void testInitCacheReceivedOnJoin() throws Exception {
checkAffinity(4, topVer(4, 0), true);
}

/**
* @throws Exception If failed.
*/
@Test
public void testClientStartFirst1() throws Exception {
clientStartFirst(1);
}

/**
* @throws Exception If failed.
*/
@Test
public void testClientStartFirst2() throws Exception {
clientStartFirst(3);
}

/**
* @param clients Number of client nodes.
* @throws Exception If failed.
*/
private void clientStartFirst(int clients) throws Exception {
forceSrvMode = true;

int topVer = 0;

for (int i = 0; i < clients; i++)
startClient(topVer, ++topVer);

cacheC = new IgniteClosure<String, CacheConfiguration[]>() {
@Override public CacheConfiguration[] apply(String nodeName) {
return null;
}
};

startServer(topVer, ++topVer);

checkAffinity(topVer, topVer(topVer, 0), true);

startServer(topVer, ++topVer);

checkAffinity(topVer, topVer(topVer, 0), false);

checkAffinity(topVer, topVer(topVer, 1), true);

stopNode(clients, ++topVer);

checkAffinity(clients + 1, topVer(topVer, 0), true);
}

/**
* @throws Exception If failed.
*/
@Test
public void testRandomOperations() throws Exception {
forceSrvMode = true;

final int MAX_SRVS = 10;
final int MAX_CLIENTS = 10;
final int MAX_CACHES = 15;
Expand Down