You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/10/12 02:57:52 UTC
[04/50] git commit: SLIDER-181. Remove REST service from Storm win
package and explicitly set STORM_LOG_DIR
SLIDER-181. Remove REST service from Storm win package and explicitly set STORM_LOG_DIR
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1893c7cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1893c7cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1893c7cb
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: 1893c7cbb39dbbe84c16b8442d99af4ca7acb373
Parents: ed189c3
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sun Oct 5 16:41:57 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sun Oct 5 16:41:57 2014 -0700
----------------------------------------------------------------------
app-packages/storm-win/appConfig-default.json | 2 --
app-packages/storm-win/metainfo.xml | 12 ++++++------
app-packages/storm-win/package/scripts/params.py | 2 --
app-packages/storm-win/package/scripts/service.py | 1 +
app-packages/storm-win/package/scripts/status_params.py | 2 --
app-packages/storm-win/package/templates/config.yaml.j2 | 9 ---------
app-packages/storm/metainfo.xml | 2 +-
7 files changed, 8 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1893c7cb/app-packages/storm-win/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/appConfig-default.json b/app-packages/storm-win/appConfig-default.json
index 428dea5..229bc1d 100644
--- a/app-packages/storm-win/appConfig-default.json
+++ b/app-packages/storm-win/appConfig-default.json
@@ -11,8 +11,6 @@
"site.global.app_root": "${AGENT_WORK_ROOT}/app/install/storm-${pkg.version}",
"site.global.user_group": "hadoop",
"site.global.security_enabled": "false",
- "site.global.rest_api_port": "${STORM_REST_API.ALLOCATED_PORT}",
- "site.global.rest_api_admin_port": "${STORM_REST_API.ALLOCATED_PORT}",
"site.storm-site.storm.log.dir" : "${AGENT_LOG_ROOT}",
"site.storm-site.storm.zookeeper.servers": "['${ZK_HOST}']",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1893c7cb/app-packages/storm-win/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/metainfo.xml b/app-packages/storm-win/metainfo.xml
index 070ce35..ec68ef6 100644
--- a/app-packages/storm-win/metainfo.xml
+++ b/app-packages/storm-win/metainfo.xml
@@ -29,6 +29,10 @@
<name>QuickLinks</name>
<exports>
<export>
+ <name>org.apache.slider.jmx</name>
+ <value>http://${STORM_UI_SERVER_HOST}:${site.storm-site.ui.port}/api/v1/cluster/summary</value>
+ </export>
+ <export>
<name>org.apache.slider.monitor</name>
<value>http://${STORM_UI_SERVER_HOST}:${site.storm-site.ui.port}</value>
</export>
@@ -43,7 +47,7 @@
<commandOrders>
<commandOrder>
<command>NIMBUS-START</command>
- <requires>SUPERVISOR-INSTALLED,STORM_UI_SERVER-INSTALLED,DRPC_SERVER-INSTALLED,STORM_REST_API-INSTALLED
+ <requires>SUPERVISOR-INSTALLED,STORM_UI_SERVER-INSTALLED,DRPC_SERVER-INSTALLED
</requires>
</commandOrder>
<commandOrder>
@@ -58,10 +62,6 @@
<command>STORM_UI_SERVER-START</command>
<requires>NIMBUS-STARTED</requires>
</commandOrder>
- <commandOrder>
- <command>STORM_REST_API-START</command>
- <requires>NIMBUS-STARTED,DRPC_SERVER-STARTED,STORM_UI_SERVER-STARTED</requires>
- </commandOrder>
</commandOrders>
<components>
@@ -99,7 +99,7 @@
<name>STORM_UI_SERVER</name>
<category>MASTER</category>
<publishConfig>true</publishConfig>
- <appExports>QuickLinks-org.apache.slider.monitor</appExports>
+ <appExports>QuickLinks-org.apache.slider.monitor,QuickLinks-org.apache.slider.jmx</appExports>
<autoStartOnFailure>true</autoStartOnFailure>
<commandScript>
<script>scripts/ui_server.py</script>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1893c7cb/app-packages/storm-win/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/package/scripts/params.py b/app-packages/storm-win/package/scripts/params.py
index c6ea62d..3a458ea 100644
--- a/app-packages/storm-win/package/scripts/params.py
+++ b/app-packages/storm-win/package/scripts/params.py
@@ -34,8 +34,6 @@ user_group = config['configurations']['global']['user_group']
java64_home = config['hostLevelParams']['java_home']
nimbus_host = config['configurations']['storm-site']['nimbus.host']
nimbus_port = config['configurations']['storm-site']['nimbus.thrift.port']
-rest_api_port = config['configurations']['global']['rest_api_port']
-rest_api_admin_port = config['configurations']['global']['rest_api_admin_port']
rest_api_conf_file = format("{conf_dir}/config.yaml")
rest_lib_dir = format("{app_root}/external/storm-rest")
storm_bin = format("{app_root}/bin/storm.cmd")
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1893c7cb/app-packages/storm-win/package/scripts/service.py
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/package/scripts/service.py b/app-packages/storm-win/package/scripts/service.py
index dd08858..1e88e5b 100644
--- a/app-packages/storm-win/package/scripts/service.py
+++ b/app-packages/storm-win/package/scripts/service.py
@@ -37,6 +37,7 @@ def service(
backtype = format("backtype.storm.daemon.{name}")
if action == "start":
+ os.environ['STORM_LOG_DIR'] = params.log_dir
cmd = format("{storm_bin} {name} > {log_dir}/{name}.out 2>&1")
Execute(cmd,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1893c7cb/app-packages/storm-win/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/package/scripts/status_params.py b/app-packages/storm-win/package/scripts/status_params.py
index 7dda158..2bf6870 100644
--- a/app-packages/storm-win/package/scripts/status_params.py
+++ b/app-packages/storm-win/package/scripts/status_params.py
@@ -28,10 +28,8 @@ pid_supervisor = format("{pid_dir}/supervisor.pid")
pid_drpc = format("{pid_dir}/drpc.pid")
pid_ui = format("{pid_dir}/ui.pid")
pid_logviewer = format("{pid_dir}/logviewer.pid")
-pid_rest_api = format("{pid_dir}/restapi.pid")
pid_files = {"logviewer":pid_logviewer,
"ui": pid_ui,
"nimbus": pid_nimbus,
"supervisor": pid_supervisor,
- "rest_api": pid_rest_api,
"drpc": pid_drpc}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1893c7cb/app-packages/storm-win/package/templates/config.yaml.j2
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/package/templates/config.yaml.j2 b/app-packages/storm-win/package/templates/config.yaml.j2
index 58f5c9e..eb68584 100644
--- a/app-packages/storm-win/package/templates/config.yaml.j2
+++ b/app-packages/storm-win/package/templates/config.yaml.j2
@@ -16,13 +16,4 @@
nimbusHost: {{nimbus_host}}
nimbusPort: {{nimbus_port}}
-# HTTP-specific options.
-http:
-
- # The port on which the HTTP server listens for service requests.
- port: {{rest_api_port}}
-
- # The port on which the HTTP server listens for administrative requests.
- adminPort: {{rest_api_admin_port}}
-
enableGanglia: false
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1893c7cb/app-packages/storm/metainfo.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/metainfo.xml b/app-packages/storm/metainfo.xml
index 3d1b048..1579174 100644
--- a/app-packages/storm/metainfo.xml
+++ b/app-packages/storm/metainfo.xml
@@ -30,7 +30,7 @@
<exports>
<export>
<name>org.apache.slider.jmx</name>
- <value>http://${STORM_UI_SERVER_HOST}:${site.storm-site.ui.port}/api/cluster/summary</value>
+ <value>http://${STORM_UI_SERVER_HOST}:${site.storm-site.ui.port}/api/v1/cluster/summary</value>
</export>
<export>
<name>org.apache.slider.monitor</name>