You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/04/11 16:34:22 UTC
[1/4] git commit: Fix for launching jar when some JVM opts are
specified, now corrected and using shlex library
Repository: incubator-storm
Updated Branches:
refs/heads/master 2cd8f99ea -> 6c1af3e5b
Fix for launching jar when some JVM opts are specified, now corrected and using shlex library
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/9368ac44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/9368ac44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/9368ac44
Branch: refs/heads/master
Commit: 9368ac447aeb473f926302137dbcdf914d06cd32
Parents: 263fade
Author: yerenkow <ye...@gmail.com>
Authored: Mon Feb 3 11:05:52 2014 +0200
Committer: yerenkow <ye...@gmail.com>
Committed: Mon Feb 3 11:05:52 2014 +0200
----------------------------------------------------------------------
bin/storm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/9368ac44/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index aee46cb..6100f88 100755
--- a/bin/storm
+++ b/bin/storm
@@ -22,6 +22,7 @@ import random
import subprocess as sub
import getopt
import re
+import shlex
def identity(x):
return x
@@ -45,7 +46,9 @@ if (not os.path.isfile(USER_CONF_DIR + "/storm.yaml")):
USER_CONF_DIR = CLUSTER_CONF_DIR
CONFIG_OPTS = []
CONFFILE = ""
-JAR_JVM_OPTS = os.getenv('STORM_JAR_JVM_OPTS', '')
+
+#note that JAR_JVM_OPTS is now array instead of string
+JAR_JVM_OPTS = shlex.split(os.getenv('STORM_JAR_JVM_OPTS', ''))
def get_config_opts():
@@ -155,7 +158,7 @@ def jar(jarfile, klass, *args):
jvmtype="-client",
extrajars=[jarfile, USER_CONF_DIR, STORM_DIR + "/bin"],
args=args,
- jvmopts=[' '.join(filter(None, [JAR_JVM_OPTS, "-Dstorm.jar=" + jarfile]))])
+ jvmopts=JAR_JVM_OPTS + ["-Dstorm.jar=" + jarfile])
def kill(*args):
"""Syntax: [storm kill topology-name [-w wait-time-secs]]
[2/4] git commit: Remove too verbose comment about JAR_JVM_OPTS being
array
Posted by bo...@apache.org.
Remove too verbose comment about JAR_JVM_OPTS being array
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/8a9c635f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/8a9c635f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/8a9c635f
Branch: refs/heads/master
Commit: 8a9c635f9ffe478f5937ba125201adbf8cb72162
Parents: 9368ac4
Author: yerenkow <ye...@gmail.com>
Authored: Fri Apr 11 08:49:11 2014 +0300
Committer: yerenkow <ye...@gmail.com>
Committed: Fri Apr 11 08:49:11 2014 +0300
----------------------------------------------------------------------
bin/storm | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8a9c635f/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index 6100f88..002467b 100755
--- a/bin/storm
+++ b/bin/storm
@@ -46,8 +46,6 @@ if (not os.path.isfile(USER_CONF_DIR + "/storm.yaml")):
USER_CONF_DIR = CLUSTER_CONF_DIR
CONFIG_OPTS = []
CONFFILE = ""
-
-#note that JAR_JVM_OPTS is now array instead of string
JAR_JVM_OPTS = shlex.split(os.getenv('STORM_JAR_JVM_OPTS', ''))
[4/4] git commit: Updated Changelog STORM-196: When JVM_OPTS are set,
storm jar fails to detect storm.jar from environment
Posted by bo...@apache.org.
Updated Changelog STORM-196: When JVM_OPTS are set, storm jar fails to detect storm.jar from environment
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/6c1af3e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/6c1af3e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/6c1af3e5
Branch: refs/heads/master
Commit: 6c1af3e5b0f78c8d947a731b4609afaff955950c
Parents: de46f71
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Fri Apr 11 14:33:54 2014 +0000
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Fri Apr 11 14:33:54 2014 +0000
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/6c1af3e5/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e925c5..cccda61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.2-incubating (unreleased)
+ * STORM-196: When JVM_OPTS are set, storm jar fails to detect storm.jar from environment
* STORM-260: Fix a potential race condition with simulated time in Storm's unit tests
* STORM-258: Update commons-io version to 2.4
* STORM-270: don't package .clj files in release jars.
[3/4] git commit: Merge branch 'fix-storm-shlex' of
https://github.com/yerenkow/incubator-storm STORM-196: When JVM_OPTS are set,
storm jar fails to detect storm.jar from environment
Posted by bo...@apache.org.
Merge branch 'fix-storm-shlex' of https://github.com/yerenkow/incubator-storm
STORM-196: When JVM_OPTS are set, storm jar fails to detect storm.jar from environment
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/de46f713
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/de46f713
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/de46f713
Branch: refs/heads/master
Commit: de46f7136f07d78946c7c5d16098dd56712ac8d4
Parents: 2cd8f99 8a9c635
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Fri Apr 11 14:32:54 2014 +0000
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Fri Apr 11 14:32:54 2014 +0000
----------------------------------------------------------------------
bin/storm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/de46f713/bin/storm
----------------------------------------------------------------------