From d8852b83d059227608e04d64787ea7183dd4208e Mon Sep 17 00:00:00 2001 From: Adrien Grand <jpountz@gmail.com> Date: Tue, 19 Feb 2019 15:03:47 +0100 Subject: [PATCH] Don't swallow IOExceptions in InternalTestCluster. (#39068) Relates #39030 --- .../org/elasticsearch/test/InternalTestCluster.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java index 0aee6c45a91..2c02abab9dc 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java @@ -844,15 +844,18 @@ public final class InternalTestCluster extends TestCluster { } @Override - public synchronized void close() { + public synchronized void close() throws IOException { if (this.open.compareAndSet(true, false)) { if (activeDisruptionScheme != null) { activeDisruptionScheme.testClusterClosed(); activeDisruptionScheme = null; } - IOUtils.closeWhileHandlingException(nodes.values()); - nodes.clear(); - executor.shutdownNow(); + try { + IOUtils.close(nodes.values()); + } finally { + nodes.clear(); + executor.shutdownNow(); + } } }