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/10 16:08:47 UTC
[1/3] storm git commit: Merge pull request #579 from
ppoulosk/YSTORM-2270
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 101fb1fc5 -> b2d366a35
Merge pull request #579 from ppoulosk/YSTORM-2270
[YSTORM-2270] Fix arraylist of strings as config value for childopts
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f0793dde
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f0793dde
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f0793dde
Branch: refs/heads/0.10.x-branch
Commit: f0793dde3c377a52dda1f2279611fde16b0ab5b0
Parents: 101fb1f
Author: Paul Poulosky <pp...@yahoo-inc.com>
Authored: Thu Oct 8 17:51:34 2015 -0500
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Oct 10 23:01:10 2015 +0900
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
storm-core/test/clj/backtype/storm/supervisor_test.clj | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f0793dde/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 548e365..81e4152 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -641,7 +641,7 @@
replacement-map)]
(cond
(nil? value) nil
- (list? value) (map sub-fn value)
+ (sequential? value) (vec (map sub-fn value))
:else (-> value sub-fn (clojure.string/split #"\s+")))))
(defn java-cmd []
http://git-wip-us.apache.org/repos/asf/storm/blob/f0793dde/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 e3c1595..26b0fc8 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -568,6 +568,17 @@
childopts-with-ids (supervisor/substitute-childopts childopts worker-id topology-id port)]
(is (= expected-childopts childopts-with-ids)))))
+(deftest test-substitute-childopts-happy-path-arraylist
+ (testing "worker-launcher replaces ids in childopts from arraylist"
+ (let [worker-id "w-01"
+ topology-id "s-01"
+ port 9999
+ mem-onheap 512
+ childopts '["-Xloggc:/home/y/lib/storm/current/logs/gc.worker-%ID%-%TOPOLOGY-ID%-%WORKER-ID%-%WORKER-PORT%.log" "-Xms256m" "-Xmx%HEAP-MEM%m"]
+ expected-childopts '("-Xloggc:/home/y/lib/storm/current/logs/gc.worker-9999-s-01-w-01-9999.log" "-Xms256m" "-Xmx512m")
+ childopts-with-ids (supervisor/substitute-childopts childopts worker-id topology-id port mem-onheap)]
+ (is (= expected-childopts childopts-with-ids)))))
+
(deftest test-substitute-childopts-topology-id-alone
(testing "worker-launcher replaces ids in childopts"
(let [worker-id "w-01"
[3/3] storm git commit: add STORM-1099 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1099 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b2d366a3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b2d366a3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b2d366a3
Branch: refs/heads/0.10.x-branch
Commit: b2d366a3576974757df18adf3bc8069195158a15
Parents: 1c547ab
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Oct 10 23:08:16 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Oct 10 23:08:16 2015 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b2d366a3/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10525c4..d8e1cf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.10.0
+ * STORM-1099: Fix worker childopts as arraylist of strings
* STORM-1096: Fix some issues with impersonation on the UI
* STORM-912: Support SSL on Logviewer
* STORM-1094: advance kafka offset when deserializer yields no object
[2/3] storm git commit: Remove argument from test
Posted by ka...@apache.org.
Remove argument from test
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1c547abb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1c547abb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1c547abb
Branch: refs/heads/0.10.x-branch
Commit: 1c547abb01e68eb40ea4dd8c871266ac54862659
Parents: f0793dd
Author: Paul Poulosky <pp...@thenperfect-lm.champ.corp.yahoo.com>
Authored: Fri Oct 9 09:41:25 2015 -0500
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Oct 10 23:01:15 2015 +0900
----------------------------------------------------------------------
storm-core/test/clj/backtype/storm/supervisor_test.clj | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1c547abb/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 26b0fc8..01ce365 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -568,15 +568,14 @@
childopts-with-ids (supervisor/substitute-childopts childopts worker-id topology-id port)]
(is (= expected-childopts childopts-with-ids)))))
-(deftest test-substitute-childopts-happy-path-arraylist
- (testing "worker-launcher replaces ids in childopts from arraylist"
+(deftest test-substitute-childopts-happy-path-list-arraylist
+ (testing "worker-launcher replaces ids in childopts"
(let [worker-id "w-01"
topology-id "s-01"
port 9999
- mem-onheap 512
- childopts '["-Xloggc:/home/y/lib/storm/current/logs/gc.worker-%ID%-%TOPOLOGY-ID%-%WORKER-ID%-%WORKER-PORT%.log" "-Xms256m" "-Xmx%HEAP-MEM%m"]
- expected-childopts '("-Xloggc:/home/y/lib/storm/current/logs/gc.worker-9999-s-01-w-01-9999.log" "-Xms256m" "-Xmx512m")
- childopts-with-ids (supervisor/substitute-childopts childopts worker-id topology-id port mem-onheap)]
+ childopts '["-Xloggc:/home/y/lib/storm/current/logs/gc.worker-%ID%-%TOPOLOGY-ID%-%WORKER-ID%-%WORKER-PORT%.log" "-Xms256m"]
+ expected-childopts '("-Xloggc:/home/y/lib/storm/current/logs/gc.worker-9999-s-01-w-01-9999.log" "-Xms256m")
+ childopts-with-ids (supervisor/substitute-childopts childopts worker-id topology-id port)]
(is (= expected-childopts childopts-with-ids)))))
(deftest test-substitute-childopts-topology-id-alone