You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/05/20 00:06:27 UTC
[2/5] git commit: launch workers using java from JAVA_HOME if set
launch workers using java from JAVA_HOME if set
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/38b288e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/38b288e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/38b288e3
Branch: refs/heads/master
Commit: 38b288e38768c97090cc86083dd1e6915a65658f
Parents: 2d7f977
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Mon Apr 28 16:23:35 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Mon Apr 28 16:23:35 2014 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 10 +++++++++-
storm-core/test/clj/backtype/storm/supervisor_test.clj | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/38b288e3/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 0ffb888..9ba8156 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -444,6 +444,14 @@
(map sub-fn value)
(-> value sub-fn (.split " ")))))
+(defn java-cmd []
+ (let [java-home (.get (System/getenv) "JAVA_HOME")]
+ (if (nil? java-home)
+ "java"
+ (str java-home file-path-separator "bin" file-path-separator "java")
+ )))
+
+
(defmethod launch-worker
:distributed [supervisor storm-id port worker-id]
(let [conf (:conf supervisor)
@@ -458,7 +466,7 @@
(substitute-worker-childopts s port))
logfilename (str "worker-" port ".log")
command (concat
- ["java" "-server"]
+ [(java-cmd) "-server"]
worker-childopts
topo-worker-childopts
[(str "-Djava.library.path=" (conf JAVA-LIBRARY-PATH))
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/38b288e3/storm-core/test/clj/backtype/storm/supervisor_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/backtype/storm/supervisor_test.clj b/storm-core/test/clj/backtype/storm/supervisor_test.clj
index 54a3ee9..0747b31 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -248,7 +248,7 @@
mock-worker-id "fake-worker-id"
mock-cp "mock-classpath"
exp-args-fn (fn [opts topo-opts]
- (concat ["java" "-server"]
+ (concat [(supervisor/java-cmd) "-server"]
opts
topo-opts
["-Djava.library.path="