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:34 UTC

[4/8] git commit: STORM-308 Add support for config_value to {supervisor, nimbus, ui, drpc, logviewer} childopts

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