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

Don't swallow IOExceptions in InternalTestCluster. (#39068) 

Relates #39030
This commit is contained in:
Adrien Grand 2019-02-19 15:03:47 +01:00 committed by GitHub
parent 7f8a640363
commit d8852b83d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -844,17 +844,20 @@ public final class InternalTestCluster extends TestCluster {
} }
@Override @Override
public synchronized void close() { public synchronized void close() throws IOException {
if (this.open.compareAndSet(true, false)) { if (this.open.compareAndSet(true, false)) {
if (activeDisruptionScheme != null) { if (activeDisruptionScheme != null) {
activeDisruptionScheme.testClusterClosed(); activeDisruptionScheme.testClusterClosed();
activeDisruptionScheme = null; activeDisruptionScheme = null;
} }
IOUtils.closeWhileHandlingException(nodes.values()); try {
IOUtils.close(nodes.values());
} finally {
nodes.clear(); nodes.clear();
executor.shutdownNow(); executor.shutdownNow();
} }
} }
}
public static final int REMOVED_MINIMUM_MASTER_NODES = Integer.MAX_VALUE; public static final int REMOVED_MINIMUM_MASTER_NODES = Integer.MAX_VALUE;