You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/12/14 16:29:36 UTC
[1/5] storm git commit: [STORM-1387] workers-artifacts directory
configurable, and default to be under storm.log.dir
Repository: storm
Updated Branches:
refs/heads/master 6d7b96885 -> 504bdb515
[STORM-1387] workers-artifacts directory configurable, and default to be under storm.log.dir
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3c49a734
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3c49a734
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3c49a734
Branch: refs/heads/master
Commit: 3c49a734b767c02e81fb924fef0087bec3ea588b
Parents: a3f343a
Author: zhuol <zh...@yahoo-inc.com>
Authored: Thu Dec 10 19:10:40 2015 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Thu Dec 10 19:10:40 2015 -0600
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
storm-core/src/clj/backtype/storm/config.clj | 6 +++++-
storm-core/src/clj/backtype/storm/util.clj | 1 -
storm-core/src/jvm/backtype/storm/Config.java | 8 ++++++++
4 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3c49a734/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index b7c4677..89b16f6 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -52,6 +52,7 @@ storm.auth.simple-acl.admins: []
storm.cluster.state.store: "backtype.storm.cluster_state.zookeeper_state_factory"
storm.meta.serialization.delegate: "backtype.storm.serialization.GzipThriftSerializationDelegate"
storm.codedistributor.class: "backtype.storm.codedistributor.LocalFileSystemCodeDistributor"
+storm.workers.artifacts.dir: "workers-artifacts"
storm.health.check.dir: "healthchecks"
storm.health.check.timeout.ms: 5000
http://git-wip-us.apache.org/repos/asf/storm/blob/3c49a734/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 1617a3b..a6cdc87 100644
--- a/storm-core/src/clj/backtype/storm/config.clj
+++ b/storm-core/src/clj/backtype/storm/config.clj
@@ -254,7 +254,11 @@
(defn worker-artifacts-root
([conf]
- (str (absolute-storm-local-dir conf) file-path-separator "workers-artifacts"))
+ (let [workers-artifacts-dir (conf STORM-WORKERS-ARTIFACTS-DIR)]
+ (if workers-artifacts-dir
+ (if (is-absolute-path? workers-artifacts-dir)
+ workers-artifacts-dir
+ (str backtype.storm.util/LOG-DIR file-path-separator workers-artifacts-dir)))))
([conf id]
(str (worker-artifacts-root conf) file-path-separator id))
([conf id port]
http://git-wip-us.apache.org/repos/asf/storm/blob/3c49a734/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 cbe5bf9..fcc8d66 100644
--- a/storm-core/src/clj/backtype/storm/util.clj
+++ b/storm-core/src/clj/backtype/storm/util.clj
@@ -1044,7 +1044,6 @@
(.getCanonicalPath
(clojure.java.io/file (or (System/getProperty "storm.log.dir") (str (System/getProperty "storm.home") "logs")))))
-
(defn logs-filename
[storm-id port]
(str storm-id file-path-separator port file-path-separator "worker.log"))
http://git-wip-us.apache.org/repos/asf/storm/blob/3c49a734/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 10b60b0..3c2b481 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -345,6 +345,14 @@ public class Config extends HashMap<String, Object> {
public static final String STORM_ID = "storm.id";
/**
+ * The workers-artifacts directory (where we place all workers' logs), can be either absolute or relative.
+ * By default, ${storm.log.dir}/workers-artifacts is where worker logs go.
+ * If the setting is a relative directory, it is relative to storm.log.dir.
+ */
+ @isString
+ public static final String STORM_WORKERS_ARTIFACTS_DIR = "storm.workers.artifacts.dir";
+
+ /**
* The directory where storm's health scripts go.
*/
@isString
[3/5] storm git commit: Fix supervisor unit tets
Posted by sr...@apache.org.
Fix supervisor unit tets
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c420b2b6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c420b2b6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c420b2b6
Branch: refs/heads/master
Commit: c420b2b6b4e5a2003e04a45ac6d0bb2de63df1ea
Parents: 9b8c12a
Author: zhuol <zh...@yahoo-inc.com>
Authored: Sun Dec 13 21:40:08 2015 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Sun Dec 13 21:40:08 2015 -0600
----------------------------------------------------------------------
storm-core/test/clj/backtype/storm/supervisor_test.clj | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c420b2b6/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 776ad6e..e149c00 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -461,6 +461,7 @@
_ (.mkdirs (io/file storm-local "workers" mock-worker-id))
mock-supervisor {:conf {STORM-CLUSTER-MODE :distributed
STORM-LOCAL-DIR storm-local
+ STORM-WORKERS-ARTIFACTS-DIR (str storm-local "/workers-artifacts")
SUPERVISOR-RUN-WORKER-AS-USER true
WORKER-CHILDOPTS string-opts}}]
(stubbing [read-supervisor-storm-conf {TOPOLOGY-WORKER-CHILDOPTS
@@ -491,6 +492,7 @@
exp-script (exp-script-fn list-opts topo-list-opts)
mock-supervisor {:conf {STORM-CLUSTER-MODE :distributed
STORM-LOCAL-DIR storm-local
+ STORM-WORKERS-ARTIFACTS-DIR (str storm-local "/workers-artifacts")
SUPERVISOR-RUN-WORKER-AS-USER true
WORKER-CHILDOPTS list-opts}}]
(stubbing [read-supervisor-storm-conf {TOPOLOGY-WORKER-CHILDOPTS
[4/5] storm git commit: Merge branch '1387' of
https://github.com/zhuoliu/storm into STORM-1387
Posted by sr...@apache.org.
Merge branch '1387' of https://github.com/zhuoliu/storm into STORM-1387
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5afb4baf
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5afb4baf
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5afb4baf
Branch: refs/heads/master
Commit: 5afb4bafc631593c0a4e8488f5e6cbfd4a34c035
Parents: 6d7b968 c420b2b
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Dec 14 07:13:04 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Dec 14 07:13:04 2015 -0800
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
storm-core/src/clj/backtype/storm/config.clj | 7 ++++++-
storm-core/src/clj/backtype/storm/util.clj | 1 -
storm-core/src/jvm/backtype/storm/Config.java | 8 ++++++++
storm-core/test/clj/backtype/storm/supervisor_test.clj | 2 ++
5 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5afb4baf/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
[2/5] storm git commit: Minor
Posted by sr...@apache.org.
Minor
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9b8c12aa
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9b8c12aa
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9b8c12aa
Branch: refs/heads/master
Commit: 9b8c12aa21717ec6ae2ae55d67ccd9433e1af4f6
Parents: 3c49a73
Author: zhuol <zh...@yahoo-inc.com>
Authored: Thu Dec 10 19:18:29 2015 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Thu Dec 10 19:18:29 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/config.clj | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/9b8c12aa/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 a6cdc87..ffbbe99 100644
--- a/storm-core/src/clj/backtype/storm/config.clj
+++ b/storm-core/src/clj/backtype/storm/config.clj
@@ -254,11 +254,12 @@
(defn worker-artifacts-root
([conf]
- (let [workers-artifacts-dir (conf STORM-WORKERS-ARTIFACTS-DIR)]
- (if workers-artifacts-dir
- (if (is-absolute-path? workers-artifacts-dir)
- workers-artifacts-dir
- (str backtype.storm.util/LOG-DIR file-path-separator workers-artifacts-dir)))))
+ (let [workers-artifacts-dir (conf STORM-WORKERS-ARTIFACTS-DIR)]
+ (if workers-artifacts-dir
+ (if (is-absolute-path? workers-artifacts-dir)
+ workers-artifacts-dir
+ (str backtype.storm.util/LOG-DIR file-path-separator workers-artifacts-dir))
+ (str backtype.storm.util/LOG-DIR file-path-separator "workers-artifacts"))))
([conf id]
(str (worker-artifacts-root conf) file-path-separator id))
([conf id port]
[5/5] storm git commit: Added STORM-1387 to Changelog.
Posted by sr...@apache.org.
Added STORM-1387 to Changelog.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/504bdb51
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/504bdb51
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/504bdb51
Branch: refs/heads/master
Commit: 504bdb5153bfe606633074069647ae6024c63f63
Parents: 5afb4ba
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Mon Dec 14 07:28:41 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Mon Dec 14 07:28:41 2015 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/504bdb51/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b1a9f9..28fc538 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1387: workers-artifacts directory configurable, and default to be under storm.log.dir.
* STORM-1211: Add trident state and query support for cassandra connector
* STORM-1359: Change kryo links from google code to github
* STORM-1385: Divide by zero exception in stats.clj