honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Tests] Don't log about restoring a partition if the partition is not active.

Browse Source
This commit is contained in:
Boaz Leskes 2014-07-10 20:41:17 +02:00
parent 522d4afe0c
commit 7b6e194923
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/java/org/elasticsearch/test/disruption/NetworkPartition.java
View File

@ -41,6 +41,7 @@ public abstract class NetworkPartition implements ServiceDisruptionScheme {
volatile boolean autoExpand;
protected final Random random;
protected volatile InternalTestCluster cluster;
protected volatile boolean activeDisruption = false;
public NetworkPartition(Random random) {
@ -157,6 +158,7 @@ public abstract class NetworkPartition implements ServiceDisruptionScheme {
return;
}
logger.info("nodes {} will be partitioned from {}. partition type [{}]", nodesSideOne, nodesSideTwo, getPartitionDescription());
activeDisruption = true;
for (String node1 : nodesSideOne) {
MockTransportService transportService1 = (MockTransportService) cluster.getInstance(TransportService.class, node1);
DiscoveryNode discoveryNode1 = discoveryNode(node1);
@ -170,8 +172,8 @@ public abstract class NetworkPartition implements ServiceDisruptionScheme {
@Override
public void stopDisrupting() {
if (nodesSideOne.size() == 0 || nodesSideTwo.size() == 0) {
public synchronized void stopDisrupting() {
if (nodesSideOne.size() == 0 || nodesSideTwo.size() == 0 || !activeDisruption) {
return;
}
logger.info("restoring partition between nodes {} & nodes {}", nodesSideOne, nodesSideTwo);
@ -184,6 +186,7 @@ public abstract class NetworkPartition implements ServiceDisruptionScheme {
removeDisruption(discoveryNode1, transportService1, discoveryNode2, transportService2);
}
}
activeDisruption = false;
}
abstract void applyDisruption(DiscoveryNode node1, MockTransportService transportService1,