From 21ef59cadbe4204a0152cef5cf58dffcd928a469 Mon Sep 17 00:00:00 2001 From: caofangkun Date: Tue, 26 Jan 2016 16:04:53 +0800 Subject: [PATCH 1/2] [STORM-1501] launch worker process exception will cause supervisor process exited --- storm-core/src/clj/org/apache/storm/util.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/storm-core/src/clj/org/apache/storm/util.clj b/storm-core/src/clj/org/apache/storm/util.clj index 23d39f672c0..a5682aff98b 100644 --- a/storm-core/src/clj/org/apache/storm/util.clj +++ b/storm-core/src/clj/org/apache/storm/util.clj @@ -553,7 +553,8 @@ (catch InterruptedException e (log-message log-prefix " interrupted."))) (exit-code-callback (.exitValue process))) - nil))) + nil) + :kill-fn (fn [error] (log-error (RuntimeException. ("launch process failed..."))))) process))) (defn exists-file? From 1b1c776b23baa45d2b54abde48a2a964f7a07eab Mon Sep 17 00:00:00 2001 From: caofangkun Date: Tue, 26 Jan 2016 18:48:24 +0800 Subject: [PATCH 2/2] [STORM-1501] launch worker process exception will cause supervisor process exited --- storm-core/src/clj/org/apache/storm/util.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storm-core/src/clj/org/apache/storm/util.clj b/storm-core/src/clj/org/apache/storm/util.clj index a5682aff98b..9170ebc9d8f 100644 --- a/storm-core/src/clj/org/apache/storm/util.clj +++ b/storm-core/src/clj/org/apache/storm/util.clj @@ -554,7 +554,7 @@ (log-message log-prefix " interrupted."))) (exit-code-callback (.exitValue process))) nil) - :kill-fn (fn [error] (log-error (RuntimeException. ("launch process failed..."))))) + :kill-fn (fn [error] (log-error (RuntimeException. ("launch process failed...")))))) process))) (defn exists-file?