You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2016/04/01 17:12:13 UTC
[2/4] storm git commit: Back to ignore all exception
Back to ignore all exception
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b3b934a7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b3b934a7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b3b934a7
Branch: refs/heads/1.x-branch
Commit: b3b934a777e6a2f1ec505e63336c12549cd949c1
Parents: c541624
Author: zhuol <zh...@yahoo-inc.com>
Authored: Thu Mar 31 11:12:25 2016 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Thu Mar 31 11:12:25 2016 -0500
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/supervisor.clj | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b3b934a7/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
index ced8e7e..b8242ca 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@ -297,9 +297,7 @@
(rmr-as-user conf id (worker-pid-path conf id pid))
(rmpath (worker-pid-path conf id pid))
(rmpath (worker-tmp-root conf id pid))
- (catch IOException e
- (log-warn-error e "Failed to cleanup pid dir: " pid " for worker " id". Will retry later"))
- (catch RuntimeException e
+ (catch Exception e
(log-warn-error e "Failed to cleanup pid dir: " pid " for worker " id". Will retry later")))))
;; on windows, the supervisor may still holds the lock on the worker directory
(try-cleanup-worker conf id))