[storm] branch master updated: STORM-3696 don't ignore InterruptedException

[ag...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

agresch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git


The following commit(s) were added to refs/heads/master by this push:
     new feb103e  STORM-3696 don't ignore InterruptedException
     new eeeaef3  Merge pull request #3332 from agresch/agresch_storm_3696
feb103e is described below

commit feb103e267f591920918473e0360d578e2c34c9e
Author: Aaron Gresch <ag...@yahoo-inc.com>
AuthorDate: Tue Sep 8 14:14:10 2020 -0500

    STORM-3696 don't ignore InterruptedException
---
 .../org/apache/storm/daemon/supervisor/ClientSupervisorUtils.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 @@ public class ClientSupervisorUtils {
         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;