You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/10/03 08:40:27 UTC
[1/4] storm git commit: [STORM-1066] add current directory for worker
process launcher
Repository: storm
Updated Branches:
refs/heads/master b0c704925 -> 7c902976c
[STORM-1066] add current directory for worker process launcher
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8edf1c28
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8edf1c28
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8edf1c28
Branch: refs/heads/master
Commit: 8edf1c28eb82c31969a39041d89b2f0923a3d0f4
Parents: ced6224
Author: zhuol <zh...@yahoo-inc.com>
Authored: Tue Sep 29 12:49:01 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Tue Sep 29 12:49:01 2015 -0500
----------------------------------------------------------------------
.../src/clj/backtype/storm/daemon/supervisor.clj | 18 +++++++++---------
storm-core/src/clj/backtype/storm/util.clj | 3 ++-
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8edf1c28/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 2a7613d..c11461e 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -196,7 +196,7 @@
(defn generate-supervisor-id []
(uuid))
-(defnk worker-launcher [conf user args :environment {} :log-prefix nil :exit-code-callback nil]
+(defnk worker-launcher [conf user args :environment {} :log-prefix nil :exit-code-callback nil :directory nil]
(let [_ (when (clojure.string/blank? user)
(throw (java.lang.IllegalArgumentException.
"User cannot be blank when calling worker-launcher.")))
@@ -205,7 +205,7 @@
wl (if wl-initial wl-initial (str storm-home "/bin/worker-launcher"))
command (concat [wl user] args)]
(log-message "Running as user:" user " command:" (pr-str command))
- (launch-process command :environment environment :log-prefix log-prefix :exit-code-callback exit-code-callback)
+ (launch-process command :environment environment :log-prefix log-prefix :exit-code-callback exit-code-callback :directory directory)
))
(defnk worker-launcher-and-wait [conf user args :environment {} :log-prefix nil]
@@ -725,15 +725,15 @@
(write-log-metadata! storm-conf user worker-id storm-id port conf)
(set-worker-user! conf worker-id user)
(let [log-prefix (str "Worker Process " worker-id)
- callback (fn [exit-code]
- (log-message log-prefix " exited with code: " exit-code)
- (add-dead-worker worker-id))]
+ callback (fn [exit-code]
+ (log-message log-prefix " exited with code: " exit-code)
+ (add-dead-worker worker-id))
+ worker-dir (worker-root conf worker-id)]
(remove-dead-worker worker-id)
(if run-worker-as-user
- (let [worker-dir (worker-root conf worker-id)]
- (worker-launcher conf user ["worker" worker-dir (write-script worker-dir command :environment topology-worker-environment)] :log-prefix log-prefix :exit-code-callback callback))
- (launch-process command :environment topology-worker-environment :log-prefix log-prefix :exit-code-callback callback)
- ))))
+ (worker-launcher conf user ["worker" worker-dir (write-script worker-dir command :environment topology-worker-environment)] :log-prefix log-prefix :exit-code-callback callback :directory (File. worker-dir))
+ (launch-process command :environment topology-worker-environment :log-prefix log-prefix :exit-code-callback callback :directory (File. worker-dir)))
+ )))
;; local implementation
http://git-wip-us.apache.org/repos/asf/storm/blob/8edf1c28/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/util.clj b/storm-core/src/clj/backtype/storm/util.clj
index c0f266a..1e8e032 100644
--- a/storm-core/src/clj/backtype/storm/util.clj
+++ b/storm-core/src/clj/backtype/storm/util.clj
@@ -523,9 +523,10 @@
))
(defnk launch-process
- [command :environment {} :log-prefix nil :exit-code-callback nil]
+ [command :environment {} :log-prefix nil :exit-code-callback nil :directory nil]
(let [builder (ProcessBuilder. command)
process-env (.environment builder)]
+ (when directory (.directory builder directory))
(.redirectErrorStream builder true)
(doseq [[k v] environment]
(.put process-env k v))
[3/4] storm git commit: Merge branch '1066' of
https://github.com/zhuoliu/storm into STORM-1066
Posted by ka...@apache.org.
Merge branch '1066' of https://github.com/zhuoliu/storm into STORM-1066
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bdb8ff01
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bdb8ff01
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bdb8ff01
Branch: refs/heads/master
Commit: bdb8ff01aae87b75b7a3ab3224ec0205c4b5f49b
Parents: b0c7049 4386fe6
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Oct 3 13:51:18 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Oct 3 13:51:18 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/config.clj | 4 +++-
.../src/clj/backtype/storm/daemon/supervisor.clj | 18 +++++++++---------
storm-core/src/clj/backtype/storm/util.clj | 3 ++-
3 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bdb8ff01/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bdb8ff01/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------
[4/4] storm git commit: add STORM-1066 to CHANGELOG.md (0.10.0)
Posted by ka...@apache.org.
add STORM-1066 to CHANGELOG.md (0.10.0)
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7c902976
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7c902976
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7c902976
Branch: refs/heads/master
Commit: 7c902976c370a0dbcced77d44a5e6a4de589de96
Parents: bdb8ff0
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Oct 3 13:55:21 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Oct 3 13:55:21 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7c902976/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 580273e..4ee9b08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,6 +68,7 @@
* STORM-949: On the topology summary UI page, last shown error should have the time and date
## 0.10.0-beta2
+ * STORM-1066: Specify current directory when supervisor launches a worker
* STORM-1012: Shaded everything that was not already shaded
* STORM-967: Shaded everything that was not already shaded
* STORM-922: Shaded everything that was not already shaded
[2/4] storm git commit: Fix one bug in absolute-storm-local-dir
function
Posted by ka...@apache.org.
Fix one bug in absolute-storm-local-dir function
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4386fe62
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4386fe62
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4386fe62
Branch: refs/heads/master
Commit: 4386fe62c7f80e0785ba7c3d46a5c986089db51c
Parents: 8edf1c2
Author: zhuol <zh...@yahoo-inc.com>
Authored: Tue Sep 29 15:17:53 2015 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Tue Sep 29 16:40:32 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/config.clj | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4386fe62/storm-core/src/clj/backtype/storm/config.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/config.clj b/storm-core/src/clj/backtype/storm/config.clj
index f7fabc4..57471f4 100644
--- a/storm-core/src/clj/backtype/storm/config.clj
+++ b/storm-core/src/clj/backtype/storm/config.clj
@@ -134,7 +134,9 @@
(defn absolute-storm-local-dir [conf]
(let [storm-home (System/getProperty "storm.home")
path (conf STORM-LOCAL-DIR)]
- (if (is-absolute-path? path) path (str storm-home file-path-separator path))))
+ (if path
+ (if (is-absolute-path? path) path (str storm-home file-path-separator path))
+ (str storm-home file-path-separator "storm-local"))))
(defn master-local-dir
[conf]