honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InternalTestCluster shouldn't auto heal an active disruption when a new one is set 

Instead people should explicitly clear the existing one so it's clear what's going on.
This commit is contained in:
Boaz Leskes 2016-12-06 19:09:21 +01:00
parent 6da44c8164
commit 4519bdfeb0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java
View File

@ -1213,7 +1213,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase {
for (String node : nodes) { for (String node : nodes) {
assertNoMaster(node); assertNoMaster(node);
} }
isolateAllNodes.stopDisrupting(); internalCluster().clearDisruptionScheme();
ensureStableCluster(3); ensureStableCluster(3);
final String preferredMasterName = internalCluster().getMasterName(); final String preferredMasterName = internalCluster().getMasterName();
final DiscoveryNode preferredMaster = internalCluster().clusterService(preferredMasterName).localNode(); final DiscoveryNode preferredMaster = internalCluster().clusterService(preferredMasterName).localNode();

3
test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
View File

@ -1756,7 +1756,8 @@ public final class InternalTestCluster extends TestCluster {
public void setDisruptionScheme(ServiceDisruptionScheme scheme) { public void setDisruptionScheme(ServiceDisruptionScheme scheme) {
clearDisruptionScheme(); assert activeDisruptionScheme == null :
"there is already and active disruption [" + activeDisruptionScheme + "]. call clearDisruptionScheme first";
scheme.applyToCluster(this); scheme.applyToCluster(this);
activeDisruptionScheme = scheme; activeDisruptionScheme = scheme;
} }