Permalink
Browse files

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

  • Loading branch information...
HeartSaVioR committed Apr 4, 2017
2 parents e2048a6 + 8dab696 commit 525977811761d281e11d450260b4b94513ee5061
Showing with 4 additions and 2 deletions.
  1. +4 −2 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)

0 comments on commit 5259778

Please sign in to comment.