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/05/21 17:27:31 UTC
[1/8] git commit: storm-283 Support for config_value,
running storm daemons in background
Repository: incubator-storm
Updated Branches:
refs/heads/master cf1ffe735 -> 4ac0becbd
storm-283 Support for config_value, running storm daemons in background
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/60fac276
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/60fac276
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/60fac276
Branch: refs/heads/master
Commit: 60fac27624611a5a25b3e2102149bff7f015293e
Parents: dc4de42
Author: ChitturiPadma <pa...@gmail.com>
Authored: Tue Apr 29 15:43:35 2014 +0530
Committer: ChitturiPadma <pa...@gmail.com>
Committed: Tue Apr 29 15:43:35 2014 +0530
----------------------------------------------------------------------
bin/storm.cmd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/60fac276/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 5ad84f4..a12d359 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -80,7 +80,7 @@
%JAVA% %JAVA_HEAP_MAX% %STORM_OPTS% %STORM_LOG_FILE% %CLASS% %storm-command-arguments%
)
set path=%PATH%;%STORM_BIN_DIR%;%STORM_SBIN_DIR%
- call %JAVA% %JAVA_HEAP_MAX% %STORM_OPTS% %STORM_LOG_FILE% %CLASS% %storm-command-arguments%
+ call start /b %JAVA% %JAVA_HEAP_MAX% %STORM_OPTS% %STORM_LOG_FILE% %CLASS% %storm-command-arguments%
goto :eof
[8/8] git commit: Added STORM-3078 to changelog
Posted by bo...@apache.org.
Added STORM-3078 to changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/4ac0becb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/4ac0becb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/4ac0becb
Branch: refs/heads/master
Commit: 4ac0becbd0d346316ab39c8bf46f27955e8f29cb
Parents: f6c306b
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Wed May 21 10:23:21 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Wed May 21 10:23:21 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/4ac0becb/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d5f9d7..4a1ab8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.2-incubating (unreleased)
+ * STORM-308: Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts
* STORM-309: storm-starter Readme: windows documentation update
* STORM-318: update storm-kafka to use apache curator-2.4.0
* STORM-303: storm-kafka reliability improvements
[3/8] git commit: STORM-308 Add support for config_value to
{supervisor, nimbus, ui, drpc, logviewer} childopts
Posted by bo...@apache.org.
STORM-308 Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/85f3bddc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/85f3bddc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/85f3bddc
Branch: refs/heads/master
Commit: 85f3bddc24774c5f62af71069c522cb32b1bc58f
Parents: 442752b
Author: ChitturiPadma <pa...@gmail.com>
Authored: Tue May 6 16:44:18 2014 +0530
Committer: ChitturiPadma <pa...@gmail.com>
Committed: Tue May 6 16:44:18 2014 +0530
----------------------------------------------------------------------
bin/storm.cmd | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/85f3bddc/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index a12d359..3eca1bc 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -106,6 +106,12 @@
:drpc
set CLASS=backtype.storm.daemon.drpc
set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
+ %JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value drpc.childopts > temp.txt
+ FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
+ if %%i == VALUE: (
+ set JAVA_HEAP_MAX=%%j )
+ )
+ del /F temp.txt
goto :eof
:help
@@ -125,11 +131,23 @@
:logviewer
set CLASS=backtype.storm.daemon.logviewer
set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
+ %JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value logviewer.childopts > temp.txt
+ FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
+ if %%i == VALUE: (
+ set JAVA_HEAP_MAX=%%j )
+ )
+ del /F temp.txt
goto :eof
:nimbus
set CLASS=backtype.storm.daemon.nimbus
set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
+ %JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value nimbus.childopts > temp.txt
+ FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
+ if %%i == VALUE: (
+ set JAVA_HEAP_MAX=%%j )
+ )
+ del /F temp.txt
goto :eof
:rebalance
@@ -150,12 +168,25 @@
:supervisor
set CLASS=backtype.storm.daemon.supervisor
set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
+ %JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value supervisor.childopts > temp.txt
+ FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
+ if %%i == VALUE: (
+ set JAVA_HEAP_MAX=%%j )
+ )
+ del /F temp.txt
+
goto :eof
:ui
set CLASS=backtype.storm.ui.core
set CLASSPATH=%CLASSPATH%;%STORM_HOME%
set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
+ %JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value ui.childopts > temp.txt
+ FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
+ if %%i == VALUE: (
+ set JAVA_HEAP_MAX=%%j )
+ )
+ del /F temp.txt
goto :eof
:version
[5/8] git commit: STORM-308 Add support for config_value to
{supervisor, nimbus, ui, drpc, logviewer} childopts
Posted by bo...@apache.org.
STORM-308 Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts
Made changes such that the output of the command that fetches java.library.path is split based on newlines in outer loop and inner loop retrieves the value defined in yaml file
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/f55f766d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/f55f766d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/f55f766d
Branch: refs/heads/master
Commit: f55f766d7085a92ea4dfcf645fca10243ec92b89
Parents: d42daf5
Author: ChitturiPadma <pa...@gmail.com>
Authored: Tue May 13 16:57:40 2014 +0530
Committer: ChitturiPadma <pa...@gmail.com>
Committed: Tue May 13 16:57:40 2014 +0530
----------------------------------------------------------------------
bin/storm-config.cmd | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/f55f766d/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index 184ba35..9a11c34 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -87,16 +87,20 @@ if not defined STORM_LOGBACK_CONFIGURATION_FILE (
)
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value java.library.path > temp.txt
-FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
- if %%i == VALUE: (
- set JAVA_LIBRARY_PATH=%%j )
+FOR /F "delims=" %%i in (temp.txt) do (
+ FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
+ if %%a == VALUE: (
+ set JAVA_LIBRARY_PATH=%%b
+ goto :storm_opts)
+ )
)
-del /F temp.txt
-set STORM_OPTS=-Dstorm.options= -Dstorm.home=%STORM_HOME% -Djava.library.path=%JAVA_LIBRARY_PATH%
-set STORM_OPTS=%STORM_OPTS% -Dlogback.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE%
-set STORM_OPTS=%STORM_OPTS% -Dstorm.log.dir=%STORM_LOG_DIR%
+:storm_opts
+ set STORM_OPTS=-Dstorm.options= -Dstorm.home=%STORM_HOME% -Djava.library.path=%JAVA_LIBRARY_PATH%
+ set STORM_OPTS=%STORM_OPTS% -Dlogback.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE%
+ set STORM_OPTS=%STORM_OPTS% -Dstorm.log.dir=%STORM_LOG_DIR%
+ del /F temp.txt
if not defined STORM_SERVER_OPTS (
[7/8] git commit: Merge branch 'storm-cmd-windows' of
https://github.com/ChitturiPadma/incubator-storm into STORM-308
Posted by bo...@apache.org.
Merge branch 'storm-cmd-windows' of https://github.com/ChitturiPadma/incubator-storm into STORM-308
STORM-308: Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/f6c306b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/f6c306b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/f6c306b2
Branch: refs/heads/master
Commit: f6c306b27036ff9905108379846125ee18e772ff
Parents: cf1ffe7 358d5d0
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Wed May 21 10:22:48 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Wed May 21 10:22:48 2014 -0500
----------------------------------------------------------------------
bin/storm-config.cmd | 18 +++++++++++++---
bin/storm.cmd | 52 +++++++++++++++++++++++++++++++++++++++++------
2 files changed, 61 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[4/8] git commit: STORM-308 Add support for config_value to
{supervisor, nimbus, ui, drpc, logviewer} childopts
Posted by bo...@apache.org.
STORM-308 Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/d42daf5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/d42daf5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/d42daf5b
Branch: refs/heads/master
Commit: d42daf5be94e92d506fb83985802fa05d20b62ad
Parents: 85f3bdd
Author: ChitturiPadma <pa...@gmail.com>
Authored: Mon May 12 12:55:24 2014 +0530
Committer: ChitturiPadma <pa...@gmail.com>
Committed: Mon May 12 12:55:24 2014 +0530
----------------------------------------------------------------------
bin/storm.cmd | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d42daf5b/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 3eca1bc..134a152 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -105,13 +105,13 @@
:drpc
set CLASS=backtype.storm.daemon.drpc
- set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value drpc.childopts > temp.txt
FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
if %%i == VALUE: (
- set JAVA_HEAP_MAX=%%j )
+ set DRPC_CHILDOPTS=%%j )
)
del /F temp.txt
+ set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %DRPC_CHILDOPTS%
goto :eof
:help
@@ -130,24 +130,24 @@
:logviewer
set CLASS=backtype.storm.daemon.logviewer
- set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value logviewer.childopts > temp.txt
FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
if %%i == VALUE: (
- set JAVA_HEAP_MAX=%%j )
+ set LOGVIEWER_CHILDOPTS=%%j )
)
del /F temp.txt
+ set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %LOGVIEWER_CHILDOPTS%
goto :eof
:nimbus
set CLASS=backtype.storm.daemon.nimbus
- set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value nimbus.childopts > temp.txt
FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
if %%i == VALUE: (
- set JAVA_HEAP_MAX=%%j )
+ set NIMBUS_CHILDOPTS=%%j )
)
del /F temp.txt
+ set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %NIMBUS_CHILDOPTS%
goto :eof
:rebalance
@@ -167,26 +167,25 @@
:supervisor
set CLASS=backtype.storm.daemon.supervisor
- set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value supervisor.childopts > temp.txt
FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
if %%i == VALUE: (
- set JAVA_HEAP_MAX=%%j )
+ set SUPERVISOR_CHILDOPTS=%%j )
)
del /F temp.txt
-
+ set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %SUPERVISOR_CHILDOPTS%
goto :eof
:ui
set CLASS=backtype.storm.ui.core
set CLASSPATH=%CLASSPATH%;%STORM_HOME%
- set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS%
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value ui.childopts > temp.txt
FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
if %%i == VALUE: (
- set JAVA_HEAP_MAX=%%j )
+ set UI_CHILDOPTS=%%j )
)
del /F temp.txt
+ set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %UI_CHILDOPTS%
goto :eof
:version
[2/8] git commit: STORM-283 Support for config_value,
running storm daemons as background process
Posted by bo...@apache.org.
STORM-283 Support for config_value, running storm daemons as background process
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/442752b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/442752b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/442752b8
Branch: refs/heads/master
Commit: 442752b86647bd7a9ebf149dcbc6862fbb993911
Parents: 60fac27
Author: ChitturiPadma <pa...@gmail.com>
Authored: Tue Apr 29 15:46:54 2014 +0530
Committer: ChitturiPadma <pa...@gmail.com>
Committed: Tue Apr 29 15:46:54 2014 +0530
----------------------------------------------------------------------
bin/storm-config.cmd | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/442752b8/bin/storm-config.cmd
----------------------------------------------------------------------
diff --git a/bin/storm-config.cmd b/bin/storm-config.cmd
index 71c1721..184ba35 100644
--- a/bin/storm-config.cmd
+++ b/bin/storm-config.cmd
@@ -85,8 +85,16 @@ if not defined STORM_LOG_DIR (
if not defined STORM_LOGBACK_CONFIGURATION_FILE (
set STORM_LOGBACK_CONFIGURATION_FILE=%STORM_HOME%\logback\cluster.xml
)
+%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value java.library.path > temp.txt
-set STORM_OPTS=-Dstorm.home=%STORM_HOME% -Djava.library.path=sbin
+FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
+ if %%i == VALUE: (
+ set JAVA_LIBRARY_PATH=%%j )
+)
+
+del /F temp.txt
+
+set STORM_OPTS=-Dstorm.options= -Dstorm.home=%STORM_HOME% -Djava.library.path=%JAVA_LIBRARY_PATH%
set STORM_OPTS=%STORM_OPTS% -Dlogback.configurationFile=%STORM_LOGBACK_CONFIGURATION_FILE%
set STORM_OPTS=%STORM_OPTS% -Dstorm.log.dir=%STORM_LOG_DIR%
[6/8] git commit: STORM-308 Add support for config_value to
{supervisor, nimbus, ui, drpc, logviewer} childopts
Posted by bo...@apache.org.
STORM-308 Add support for config_value to {supervisor,nimbus,ui,drpc,logviewer} childopts
Modified code that uses nested loop to fetch the childopts value from storm.yaml file and used single CHILDOPTS variable to hold the value.
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/358d5d01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/358d5d01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/358d5d01
Branch: refs/heads/master
Commit: 358d5d0126fc1834861420bc30839f4ab37ecfe4
Parents: f55f766
Author: ChitturiPadma <pa...@gmail.com>
Authored: Tue May 13 17:02:17 2014 +0530
Committer: ChitturiPadma <pa...@gmail.com>
Committed: Tue May 13 17:02:17 2014 +0530
----------------------------------------------------------------------
bin/storm.cmd | 62 +++++++++++++++++++++++++++++++-----------------------
1 file changed, 36 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/358d5d01/bin/storm.cmd
----------------------------------------------------------------------
diff --git a/bin/storm.cmd b/bin/storm.cmd
index 134a152..17c01d6 100644
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@ -106,12 +106,13 @@
:drpc
set CLASS=backtype.storm.daemon.drpc
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value drpc.childopts > temp.txt
- FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
- if %%i == VALUE: (
- set DRPC_CHILDOPTS=%%j )
- )
- del /F temp.txt
- set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %DRPC_CHILDOPTS%
+ FOR /F "delims=" %%i in (temp.txt) do (
+ FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
+ if %%a == VALUE: (
+ set CHILDOPTS=%%b
+ call :set_childopts)
+ )
+ )
goto :eof
:help
@@ -131,23 +132,25 @@
:logviewer
set CLASS=backtype.storm.daemon.logviewer
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value logviewer.childopts > temp.txt
- FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
- if %%i == VALUE: (
- set LOGVIEWER_CHILDOPTS=%%j )
+ FOR /F "delims=" %%i in (temp.txt) do (
+ FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
+ if %%a == VALUE: (
+ set CHILDOPTS=%%b
+ call :set_childopts)
+ )
)
- del /F temp.txt
- set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %LOGVIEWER_CHILDOPTS%
goto :eof
:nimbus
set CLASS=backtype.storm.daemon.nimbus
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value nimbus.childopts > temp.txt
- FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
- if %%i == VALUE: (
- set NIMBUS_CHILDOPTS=%%j )
+ FOR /F "delims=" %%i in (temp.txt) do (
+ FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
+ if %%a == VALUE: (
+ set CHILDOPTS=%%b
+ call :set_childopts)
+ )
)
- del /F temp.txt
- set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %NIMBUS_CHILDOPTS%
goto :eof
:rebalance
@@ -168,24 +171,26 @@
:supervisor
set CLASS=backtype.storm.daemon.supervisor
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value supervisor.childopts > temp.txt
- FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
- if %%i == VALUE: (
- set SUPERVISOR_CHILDOPTS=%%j )
+ FOR /F "delims=" %%i in (temp.txt) do (
+ FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
+ if %%a == VALUE: (
+ set CHILDOPTS=%%b
+ call :set_childopts)
+ )
)
- del /F temp.txt
- set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %SUPERVISOR_CHILDOPTS%
goto :eof
:ui
set CLASS=backtype.storm.ui.core
set CLASSPATH=%CLASSPATH%;%STORM_HOME%
%JAVA% -client -Dstorm.options= -Dstorm.conf.file= -cp %CLASSPATH% backtype.storm.command.config_value ui.childopts > temp.txt
- FOR /F "tokens=1,* delims= " %%i in (temp.txt) do (
- if %%i == VALUE: (
- set UI_CHILDOPTS=%%j )
+ FOR /F "delims=" %%i in (temp.txt) do (
+ FOR /F "tokens=1,* delims= " %%a in ("%%i") do (
+ if %%a == VALUE: (
+ set CHILDOPTS=%%b
+ call :set_childopts)
+ )
)
- del /F temp.txt
- set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %UI_CHILDOPTS%
goto :eof
:version
@@ -208,6 +213,11 @@
)
set storm-command-arguments=%_arguments%
goto :eof
+
+:set_childopts
+ set STORM_OPTS=%STORM_SERVER_OPTS% %STORM_OPTS% %CHILDOPTS%
+ del /F temp.txt
+ goto :eof
:print_usage
@echo Usage: storm COMMAND