Skip to content
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

Jump to bottom

Fixes SplitBrainTest start issues #19189

Merged
merged 1 commit into from Jul 28, 2021
Merged

Fixes SplitBrainTest start issues #19189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...st/src/test/java/com/hazelcast/splitbrainprotection/AbstractSplitBrainProtectionTest.java
View file
Open in desktop
Expand Up @@ -239,7 +239,7 @@ protected static void initCluster(Config config, TestHazelcastInstanceFactory fa
config.addSetConfig(newSetConfig(splitBrainProtectionOn, splitBrainProtectionName));
config.addPNCounterConfig(newPNCounterConfig(splitBrainProtectionOn, splitBrainProtectionName));
}
cluster.createFiveMemberCluster(config);
cluster.createFiveMemberCluster(config, splitBrainProtectionNames);
for (SplitBrainProtectionOn splitBrainProtectionOn : types) {
LOGGER.info("Queue size before data initialization for "
+ splitBrainProtectionOn
Expand Down
14 changes: 13 additions & 1 deletion hazelcast/src/test/java/com/hazelcast/splitbrainprotection/PartitionedCluster.java
View file
Open in desktop
Expand Up @@ -74,8 +74,12 @@ public HazelcastInstance getInstance(int index) {
return instance[index];
}

public void createFiveMemberCluster(Config config) {
public void createFiveMemberCluster(Config config, String[] splitBrainProtectionIds) {
createInstances(config);
verifySplitBrainProtectionsPresentEventually(SUCCESSFUL_SPLIT_BRAIN_PROTECTION_TEST_NAME);
for (String splitBrainProtectionId : splitBrainProtectionIds) {
verifySplitBrainProtectionsPresentEventually(splitBrainProtectionId);
}
}

public void splitFiveMembersThreeAndTwo(String... splitBrainProtectionIds) {
Expand Down Expand Up @@ -133,6 +137,14 @@ private void splitCluster() {
closeConnectionBetween(instance[4], instance[0]);
}

private void verifySplitBrainProtectionsPresentEventually(String splitBrainProtectionId) {
assertSplitBrainProtectionIsPresentEventually(instance[0], splitBrainProtectionId);
assertSplitBrainProtectionIsPresentEventually(instance[1], splitBrainProtectionId);
assertSplitBrainProtectionIsPresentEventually(instance[2], splitBrainProtectionId);
assertSplitBrainProtectionIsPresentEventually(instance[3], splitBrainProtectionId);
assertSplitBrainProtectionIsPresentEventually(instance[4], splitBrainProtectionId);
}

private void verifySplitBrainProtections(String splitBrainProtectionId) {
assertSplitBrainProtectionIsPresentEventually(instance[0], splitBrainProtectionId);
assertSplitBrainProtectionIsPresentEventually(instance[1], splitBrainProtectionId);
Expand Down