You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2016/03/04 19:56:48 UTC
[1/3] storm git commit: Change default temp dir for workers to worker
launch directory.
Repository: storm
Updated Branches:
refs/heads/1.x-branch 8d216926a -> 00d12e26d
Change default temp dir for workers to worker launch directory.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/275bae83
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/275bae83
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/275bae83
Branch: refs/heads/1.x-branch
Commit: 275bae83958e8c137f0faa1142a01639631531b7
Parents: 8d21692
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Mar 4 12:11:21 2016 -0600
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Mar 4 12:11:21 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/config.clj | 4 ++++
storm-core/src/clj/org/apache/storm/daemon/supervisor.clj | 4 ++++
storm-core/test/clj/org/apache/storm/supervisor_test.clj | 3 +++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/275bae83/storm-core/src/clj/org/apache/storm/config.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/config.clj b/storm-core/src/clj/org/apache/storm/config.clj
index d65c439..0717a22 100644
--- a/storm-core/src/clj/org/apache/storm/config.clj
+++ b/storm-core/src/clj/org/apache/storm/config.clj
@@ -295,6 +295,10 @@
[conf id]
(str (worker-root conf id) file-path-separator "pids"))
+(defn worker-tmp-root
+ [conf id]
+ (str (worker-root conf id) file-path-separator "tmp"))
+
(defn worker-pid-path
[conf id pid]
(str (worker-pids-root conf id) file-path-separator pid))
http://git-wip-us.apache.org/repos/asf/storm/blob/275bae83/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 2b1f4b8..1287d77 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@ -299,6 +299,7 @@
(rmr-as-user conf id (worker-pid-path conf id pid))
(try
(rmpath (worker-pid-path conf id pid))
+ (rmpath (worker-tmp-root conf id pid))
(catch Exception e)))) ;; on windows, the supervisor may still holds the lock on the worker directory
(try-cleanup-worker conf id))
(log-message "Shut down " (:supervisor-id supervisor) ":" id))
@@ -375,6 +376,7 @@
(log-message "Launching worker with assignment "
(get-worker-assignment-helper-msg assignment supervisor port id))
(local-mkdirs (worker-pids-root conf id))
+ (local-mkdirs (worker-tmp-root conf id))
(local-mkdirs (worker-heartbeats-root conf id))
(launch-worker supervisor
(:storm-id assignment)
@@ -1051,6 +1053,7 @@
storm-home (System/getProperty "storm.home")
storm-options (System/getProperty "storm.options")
storm-conf-file (System/getProperty "storm.conf.file")
+ worker-tmp-dir (worker-tmp-root conf worker-id)
storm-log-dir LOG-DIR
storm-log-conf-dir (conf STORM-LOG4J2-CONF-DIR)
storm-log4j2-conf-dir (if storm-log-conf-dir
@@ -1120,6 +1123,7 @@
(str "-Dstorm.conf.file=" storm-conf-file)
(str "-Dstorm.options=" storm-options)
(str "-Dstorm.log.dir=" storm-log-dir)
+ (str "-Djava.io.tmpdir=" worker-tmp-dir)
(str "-Dlogging.sensitivity=" logging-sensitivity)
(str "-Dlog4j.configurationFile=" log4j-configuration-file)
(str "-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector")
http://git-wip-us.apache.org/repos/asf/storm/blob/275bae83/storm-core/test/clj/org/apache/storm/supervisor_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/org/apache/storm/supervisor_test.clj b/storm-core/test/clj/org/apache/storm/supervisor_test.clj
index d9daf32..ef9f883 100644
--- a/storm-core/test/clj/org/apache/storm/supervisor_test.clj
+++ b/storm-core/test/clj/org/apache/storm/supervisor_test.clj
@@ -297,6 +297,8 @@
"-Dstorm.conf.file="
"-Dstorm.options="
(str "-Dstorm.log.dir=" file-path-separator "logs")
+ (str "-Djava.io.tmpdir=" file-path-separator "storm-local" file-path-separator
+ "workers" file-path-separator mock-worker-id file-path-separator "tmp")
(str "-Dlogging.sensitivity=" mock-sensitivity)
(str "-Dlog4j.configurationFile=" file-path-separator "log4j2" file-path-separator "worker.xml")
"-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector"
@@ -441,6 +443,7 @@
" '-Dstorm.conf.file='"
" '-Dstorm.options='"
" '-Dstorm.log.dir=/logs'"
+ " '-Djava.io.tmpdir=" (str storm-local "/workers/" mock-worker-id "/tmp'")
" '-Dlogging.sensitivity=" mock-sensitivity "'"
" '-Dlog4j.configurationFile=/log4j2/worker.xml'"
" '-DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector'"
[2/3] storm git commit: Merge branch 'storm1529-1.x-branch' of
https://github.com/kishorvpatil/incubator-storm into 1.x-branch
Posted by ki...@apache.org.
Merge branch 'storm1529-1.x-branch' of https://github.com/kishorvpatil/incubator-storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/580dc303
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/580dc303
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/580dc303
Branch: refs/heads/1.x-branch
Commit: 580dc3032bbfa774a4f30c0d00a69fcebf1c4e18
Parents: 8d21692 275bae8
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Mar 4 18:47:54 2016 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Mar 4 18:47:54 2016 +0000
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/config.clj | 4 ++++
storm-core/src/clj/org/apache/storm/daemon/supervisor.clj | 4 ++++
storm-core/test/clj/org/apache/storm/supervisor_test.clj | 3 +++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-1529 ot Changelog
Posted by ki...@apache.org.
Added STORM-1529 ot Changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/00d12e26
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/00d12e26
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/00d12e26
Branch: refs/heads/1.x-branch
Commit: 00d12e26d72ca8e32089606bbdf59af9a376ed8c
Parents: 580dc30
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Mar 4 18:48:47 2016 +0000
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Mar 4 18:48:47 2016 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/00d12e26/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7257aa8..f6fbefb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1529: Change default worker temp directory location for workers
* STORM-1543: DRPCSpout should always try to reconnect disconnected DRPCInvocationsClient
* STORM-1561: Supervisor should relaunch worker if assignments have changed
* STORM-1601: Check if /backpressure/storm-id node exists before requesting children