STORM-493: Workers inherit storm.conf.file/storm.options properties of their supervisor
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c99145c9 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c99145c9 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c99145c9 Branch: refs/heads/security Commit: c99145c93130e93bff8132516fafbecead815ea8 Parents: 5aae768 Author: Christophe Carré <[email protected]> Authored: Thu Sep 11 18:08:17 2014 +0200 Committer: Christophe Carré <[email protected]> Committed: Thu Sep 11 18:08:17 2014 +0200 ---------------------------------------------------------------------- storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 4 ++++ storm-core/test/clj/backtype/storm/supervisor_test.clj | 2 ++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/c99145c9/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 9c6e3f8..8c18e1c 100644 --- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj +++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj @@ -502,6 +502,8 @@ :distributed [supervisor storm-id port worker-id] (let [conf (:conf supervisor) storm-home (System/getProperty "storm.home") + storm-options (System/getProperty "storm.options") + storm-conf-file (System/getProperty "storm.conf.file") storm-log-dir (or (System/getProperty "storm.log.dir") (str storm-home "/logs")) stormroot (supervisor-stormdist-root conf storm-id) jlp (jlp stormroot conf) @@ -528,6 +530,8 @@ [(str "-Djava.library.path=" jlp) (str "-Dlogfile.name=" logfilename) (str "-Dstorm.home=" storm-home) + (str "-Dstorm.conf.file=" storm-conf-file) + (str "-Dstorm.options=" storm-options) (str "-Dstorm.log.dir=" storm-log-dir) (str "-Dlogback.configurationFile=" storm-home "/logback/cluster.xml") (str "-Dstorm.id=" storm-id) http://git-wip-us.apache.org/repos/asf/storm/blob/c99145c9/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 5abfa89..a61a2ae 100644 --- a/storm-core/test/clj/backtype/storm/supervisor_test.clj +++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj @@ -255,6 +255,8 @@ ["-Djava.library.path=" (str "-Dlogfile.name=worker-" mock-port ".log") "-Dstorm.home=" + "-Dstorm.conf.file=" + "-Dstorm.options=" "-Dstorm.log.dir=/logs" "-Dlogback.configurationFile=/logback/cluster.xml" (str "-Dstorm.id=" mock-storm-id)
