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 2016/03/09 05:03:11 UTC
[1/2] storm git commit: STORM-1603 Storm UT fails on supervisor test
in Windows
Repository: storm
Updated Branches:
refs/heads/0.10.x-branch 453209689 -> 3a61f87e9
STORM-1603 Storm UT fails on supervisor test in Windows
* supervisor UTs seem not handle file path delimeter properly
* due to absolute-storm-local-dir, we should care Windows specific
* if worker dir path is relative and storm.home is empty, path will be invalid
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1b6e91ec
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1b6e91ec
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1b6e91ec
Branch: refs/heads/0.10.x-branch
Commit: 1b6e91ecaf1804fed718c2997f7c82b8c3738b99
Parents: 4532096
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Mar 4 12:40:27 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Mar 4 12:40:27 2016 +0900
----------------------------------------------------------------------
.../test/clj/backtype/storm/supervisor_test.clj | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/1b6e91ec/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 01ce365..f0b2571 100644
--- a/storm-core/test/clj/backtype/storm/supervisor_test.clj
+++ b/storm-core/test/clj/backtype/storm/supervisor_test.clj
@@ -253,7 +253,6 @@
mock-worker-id "fake-worker-id"
mock-cp (str file-path-separator "base" class-path-separator file-path-separator "stormjar.jar")
mock-sensitivity "S3"
- mock-cp "/base:/stormjar.jar"
exp-args-fn (fn [opts topo-opts classpath]
(concat [(supervisor/java-cmd) "-cp" classpath
(str "-Dlogfile.name=" mock-storm-id "-worker-" mock-port ".log")
@@ -261,8 +260,8 @@
(str "-Dstorm.id=" mock-storm-id)
(str "-Dworker.id=" mock-worker-id)
(str "-Dworker.port=" mock-port)
- "-Dstorm.log.dir=/logs"
- "-Dlog4j.configurationFile=/log4j2/worker.xml"
+ (str "-Dstorm.log.dir=" file-path-separator "logs")
+ (str "-Dlog4j.configurationFile=" file-path-separator "log4j2" file-path-separator "worker.xml")
"backtype.storm.LogWriter"]
[(supervisor/java-cmd) "-server"]
opts
@@ -378,12 +377,15 @@
mock-worker-id "fake-worker-id"
mock-sensitivity "S3"
mock-cp "mock-classpath'quote-on-purpose"
- storm-local (str "/tmp/" (UUID/randomUUID))
- worker-script (str storm-local "/workers/" mock-worker-id "/storm-worker-script.sh")
+ storm-local (if on-windows?
+ (str (System/getProperty "java.io.tmpdir") file-path-separator (UUID/randomUUID))
+ (str file-path-separator "tmp" file-path-separator (UUID/randomUUID)))
+ ; worker-script itself relies on bash, so adding storm-worker-script.sh with / (not using file-path-separator) would not make an issue in production
+ worker-script (str storm-local file-path-separator "workers" file-path-separator mock-worker-id "/storm-worker-script.sh")
exp-launch ["/bin/worker-launcher"
"me"
"worker"
- (str storm-local "/workers/" mock-worker-id)
+ (str storm-local file-path-separator "workers" file-path-separator mock-worker-id)
worker-script]
exp-script-fn (fn [opts topo-opts]
(str "#!/bin/bash\n'export' 'LD_LIBRARY_PATH=';\n\nexec 'java'"
@@ -393,8 +395,8 @@
" '-Dstorm.id=" mock-storm-id "'"
" '-Dworker.id=" mock-worker-id "'"
" '-Dworker.port=" mock-port "'"
- " '-Dstorm.log.dir=/logs'"
- " '-Dlog4j.configurationFile=/log4j2/worker.xml'"
+ " '-Dstorm.log.dir=" file-path-separator "logs'"
+ " '-Dlog4j.configurationFile=" file-path-separator "log4j2" file-path-separator "worker.xml'"
" 'backtype.storm.LogWriter'"
" 'java' '-server'"
" " (shell-cmd opts)
@@ -404,9 +406,9 @@
" '-Dstorm.home='"
" '-Dstorm.conf.file='"
" '-Dstorm.options='"
- " '-Dstorm.log.dir=/logs'"
+ " '-Dstorm.log.dir=" file-path-separator "logs'"
" '-Dlogging.sensitivity=" mock-sensitivity "'"
- " '-Dlog4j.configurationFile=/log4j2/worker.xml'"
+ " '-Dlog4j.configurationFile=" file-path-separator "log4j2" file-path-separator "worker.xml'"
" '-Dstorm.id=" mock-storm-id "'"
" '-Dworker.id=" mock-worker-id "'"
" '-Dworker.port=" mock-port "'"
[2/2] storm git commit: add STORM-1603 to CHANGELOG.md (0.10.1)
Posted by ka...@apache.org.
add STORM-1603 to CHANGELOG.md (0.10.1)
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3a61f87e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3a61f87e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3a61f87e
Branch: refs/heads/0.10.x-branch
Commit: 3a61f87e936bb9776c6a523e78eb284e6d26a006
Parents: 1b6e91e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Mar 9 12:47:01 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Mar 9 12:47:01 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3a61f87e/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7a6530..84b90b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
## 0.10.1
+ * STORM-1603: Storm UT fails on supervisor test in Windows (0.10.x)
* STORM-1596: Do not use single Kerberos TGT instance between multiple threads
* STORM-1482: add missing 'break' for RedisStoreBolt
* STORM-1481: avoid Math.abs(Integer) get a negative value