commit eeeaef35f234d11f4fb8271fae3bcf76aea3864b
author agresch <agresch@gmail.com> Wed Sep 09 14:58:15 2020 -0500
committer GitHub <noreply@github.com> Wed Sep 09 14:58:15 2020 -0500
tree e7c603a1d5a7f740976e930232ba024e8c3a95da
parent e83fafcb884f4c630dbbe4a8656a4f93a41abe5b
parent feb103e267f591920918473e0360d578e2c34c9e

Merge pull request #3332 from agresch/agresch_storm_3696

STORM-3696 don't ignore InterruptedException

storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java

diff --git a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
index db93fa3..087fee1 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java
@@ -71,7 +71,10 @@
         try {
             process.waitFor();
         } catch (InterruptedException e) {
-            LOG.info("{} interrupted.", logPreFix);
+            LOG.warn("{} interrupted.", logPreFix);
+            Thread.currentThread().interrupt();
+            process.destroy();
+            throw new IOException(logPreFix + " interrupted", e);
         }
         ret = process.exitValue();
         return ret;