Merge branch 'STORM-2440-1.0.x-merge' into 1.0.x-branch

apache · Apr 4, 2017 · 5259778 · 5259778
2 parents e2048a6 + 8dab696
commit 5259778
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/storm-core/src/clj/org/apache/storm/daemon/executor.clj b/storm-core/src/clj/org/apache/storm/daemon/executor.clj
@@ -268,8 +268,10 @@
                                (catch Exception e
                                  (log-message "Error while reporting error to cluster, proceeding with shutdown")))
                              (if (or
-                                    (exception-cause? InterruptedException error)
-                                    (exception-cause? java.io.InterruptedIOException error))
+                                   (exception-cause? InterruptedException error)
+                                   (and
+                                     (exception-cause? java.io.InterruptedIOException error)
+                                     (not (exception-cause? java.net.SocketTimeoutException error))))
                                (log-message "Got interrupted excpetion shutting thread down...")
                                ((:suicide-fn <>))))
      :sampler (mk-stats-sampler storm-conf)