SLIDER-181. Remove REST service from Storm package
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4d2133fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4d2133fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4d2133fc Branch: refs/heads/develop Commit: 4d2133fc3ae240c33b01d47bd414785b81803d5d Parents: 0143c21 Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Fri Oct 3 18:34:52 2014 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Fri Oct 3 18:34:52 2014 -0700 ---------------------------------------------------------------------- app-packages/storm/appConfig-default.json | 2 -- app-packages/storm/metainfo.xml | 23 +++-------------------- app-packages/storm/package/scripts/params.py | 2 -- app-packages/storm/resources-default.json | 4 ---- 4 files changed, 3 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d2133fc/app-packages/storm/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/storm/appConfig-default.json b/app-packages/storm/appConfig-default.json index e01ceda..dc07ee3 100644 --- a/app-packages/storm/appConfig-default.json +++ b/app-packages/storm/appConfig-default.json @@ -16,8 +16,6 @@ "site.global.ganglia_server_id": "Application2", "site.global.ganglia_enabled":"true", "site.global.ganglia_server_port": "8668", - "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/4d2133fc/app-packages/storm/metainfo.xml ---------------------------------------------------------------------- diff --git a/app-packages/storm/metainfo.xml b/app-packages/storm/metainfo.xml index bbb9db6..3d1b048 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_REST_API_HOST}:${site.global.rest_api_port}/api/cluster/summary</value> + <value>http://${STORM_UI_SERVER_HOST}:${site.storm-site.ui.port}/api/cluster/summary</value> </export> <export> <name>org.apache.slider.monitor</name> @@ -55,8 +55,7 @@ <commandOrders> <commandOrder> <command>NIMBUS-START</command> - <requires>SUPERVISOR-INSTALLED,STORM_UI_SERVER-INSTALLED,DRPC_SERVER-INSTALLED,STORM_REST_API-INSTALLED - </requires> + <requires>SUPERVISOR-INSTALLED,STORM_UI_SERVER-INSTALLED,DRPC_SERVER-INSTALLED</requires> </commandOrder> <commandOrder> <command>SUPERVISOR-START</command> @@ -70,10 +69,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> @@ -111,7 +106,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> @@ -130,18 +125,6 @@ <timeout>600</timeout> </commandScript> </component> - - <component> - <name>STORM_REST_API</name> - <category>MASTER</category> - <autoStartOnFailure>true</autoStartOnFailure> - <appExports>QuickLinks-org.apache.slider.jmx</appExports> - <commandScript> - <script>scripts/rest_api.py</script> - <scriptType>PYTHON</scriptType> - <timeout>600</timeout> - </commandScript> - </component> </components> <osSpecifics> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d2133fc/app-packages/storm/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/app-packages/storm/package/scripts/params.py b/app-packages/storm/package/scripts/params.py index 1332b9f..1ccba5e 100644 --- a/app-packages/storm/package/scripts/params.py +++ b/app-packages/storm/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.py") http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4d2133fc/app-packages/storm/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/storm/resources-default.json b/app-packages/storm/resources-default.json index acecd91..31b445e 100644 --- a/app-packages/storm/resources-default.json +++ b/app-packages/storm/resources-default.json @@ -25,10 +25,6 @@ "SUPERVISOR": { "yarn.role.priority": "4", "yarn.component.instances": "1" - }, - "STORM_REST_API": { - "yarn.role.priority": "5", - "yarn.component.instances": "0" } } }