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.

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

Rename SplitBrainProtection API method #15554

Merged
merged 2 commits into from Sep 25, 2019
Merged

Rename SplitBrainProtection API method #15554

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4977841
Rename SplitBrainProtection API method
petrpleshachkov Sep 17, 2019
46a296e
Rename SplitBrainProtection API method
petrpleshachkov Sep 25, 2019
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 hazelcast/src/main/java/com/hazelcast/splitbrainprotection/SplitBrainProtection.java
View file
Open in desktop
Expand Up @@ -25,6 +25,6 @@ public interface SplitBrainProtection {
*
* @return boolean whether the minimum cluster size property is satisfied
*/
boolean isMinimumClusterSizeSatisfied();
boolean hasMinimumSize();

}
6 changes: 3 additions & 3 deletions ...lcast/src/main/java/com/hazelcast/splitbrainprotection/impl/SplitBrainProtectionImpl.java
View file
Open in desktop
Expand Up @@ -162,7 +162,7 @@ public SplitBrainProtectionConfig getConfig() {
}

@Override
public boolean isMinimumClusterSizeSatisfied() {
public boolean hasMinimumSize() {
return splitBrainProtectionState == SplitBrainProtectionState.MIN_CLUSTER_SIZE_SATISFIED;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: This SplitBrainProtectionState.MIN_CLUSTER_SIZE_SATISFIED can also be renamed.

}

Expand Down Expand Up @@ -256,7 +256,7 @@ void ensureNoSplitBrain(Operation op) {
}

void ensureNoSplitBrain() {
if (!isMinimumClusterSizeSatisfied()) {
if (!hasMinimumSize()) {
throw newSplitBrainProtectionException();
}
}
Expand Down Expand Up @@ -294,7 +294,7 @@ private SplitBrainProtectionFunction initializeSplitBrainProtectionFunction() {
public String toString() {
return "SplitBrainProtectionImpl{"
+ "splitBrainProtectionName='" + splitBrainProtectionName + '\''
+ ", isMinimumClusterSizeSatisfied=" + isMinimumClusterSizeSatisfied()
+ ", isMinimumClusterSizeSatisfied=" + hasMinimumSize()
+ ", minimumClusterSize=" + minimumClusterSize
+ ", config=" + config
+ ", splitBrainProtectionFunction=" + splitBrainProtectionFunction
Expand Down
4 changes: 2 additions & 2 deletions hazelcast/src/test/java/com/hazelcast/splitbrainprotection/PartitionedCluster.java
View file
Open in desktop
Expand Up @@ -145,7 +145,7 @@ private void assertSplitBrainProtectionIsPresentEventually(final HazelcastInstan
assertTrueEventually(new AssertTask() {
@Override
public void run() {
assertTrue(instance.getSplitBrainProtectionService().getSplitBrainProtection(splitBrainProtectionId).isMinimumClusterSizeSatisfied());
assertTrue(instance.getSplitBrainProtectionService().getSplitBrainProtection(splitBrainProtectionId).hasMinimumSize());
}
});
}
Expand All @@ -154,7 +154,7 @@ private void assertSplitBrainProtectionIsAbsentEventually(final HazelcastInstanc
assertTrueEventually(new AssertTask() {
@Override
public void run() {
assertFalse(instance.getSplitBrainProtectionService().getSplitBrainProtection(splitBrainProtectionId).isMinimumClusterSizeSatisfied());
assertFalse(instance.getSplitBrainProtectionService().getSplitBrainProtection(splitBrainProtectionId).hasMinimumSize());
}
});
}
Expand Down
10 changes: 5 additions & 5 deletions hazelcast/src/test/java/com/hazelcast/splitbrainprotection/SplitBrainProtectionTest.java
View file
Open in desktop
Expand Up @@ -88,8 +88,8 @@ public boolean apply(Collection<Member> members) {
assertTrueEventually(new AssertTask() {
@Override
public void run() {
assertTrue(splitBrainProtection1.isMinimumClusterSizeSatisfied());
assertFalse(splitBrainProtection2.isMinimumClusterSizeSatisfied());
assertTrue(splitBrainProtection1.hasMinimumSize());
assertFalse(splitBrainProtection2.hasMinimumSize());
}
});
}
Expand All @@ -114,7 +114,7 @@ public void testProbabilisticSplitBrainProtectionConsidersLocalMember() {
assertTrueEventually(new AssertTask() {
@Override
public void run() {
assertTrue(splitBrainProtection.isMinimumClusterSizeSatisfied());
assertTrue(splitBrainProtection.hasMinimumSize());
}
});
}
Expand All @@ -139,7 +139,7 @@ public void testRecentlyActiveSplitBrainProtectionConsidersLocalMember() {
assertTrueEventually(new AssertTask() {
@Override
public void run() {
assertTrue(splitBrainProtection.isMinimumClusterSizeSatisfied());
assertTrue(splitBrainProtection.hasMinimumSize());
}
});
}
Expand Down Expand Up @@ -231,7 +231,7 @@ public boolean apply(Collection<Member> members) {
} catch (Exception ignored) {
}
SplitBrainProtection splitBrainProtection = hazelcastInstance.getSplitBrainProtectionService().getSplitBrainProtection(splitBrainProtectionName);
assertFalse(splitBrainProtection.isMinimumClusterSizeSatisfied());
assertFalse(splitBrainProtection.hasMinimumSize());
}

@Test(expected = SplitBrainProtectionException.class)
Expand Down