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/05/28 02:38:21 UTC

git commit: Allow non-default config port for Storm.

Repository: incubator-slider
Updated Branches:
  refs/heads/develop 9b792e5cf -> 8d49c2729


Allow non-default config port for Storm.


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8d49c272
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8d49c272
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8d49c272

Branch: refs/heads/develop
Commit: 8d49c27298864b50ded2838cb5cdb910848f9094
Parents: 9b792e5
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue May 27 17:38:16 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue May 27 17:38:16 2014 -0700

----------------------------------------------------------------------
 app-packages/storm-v0_91/appConfig.json                   | 1 +
 app-packages/storm-v0_91/package/scripts/params.py        | 1 +
 app-packages/storm-v0_91/package/templates/config.yaml.j2 | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8d49c272/app-packages/storm-v0_91/appConfig.json
----------------------------------------------------------------------
diff --git a/app-packages/storm-v0_91/appConfig.json b/app-packages/storm-v0_91/appConfig.json
index e51c9b8..d6a6679 100644
--- a/app-packages/storm-v0_91/appConfig.json
+++ b/app-packages/storm-v0_91/appConfig.json
@@ -15,6 +15,7 @@
     "site.global.ganglia_server_host": "${NN_HOST}",
     "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.topology.tuple.serializer": "backtype.storm.serialization.types.ListDelegateSerializer",

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8d49c272/app-packages/storm-v0_91/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/app-packages/storm-v0_91/package/scripts/params.py b/app-packages/storm-v0_91/package/scripts/params.py
index d459117..cf21b27 100644
--- a/app-packages/storm-v0_91/package/scripts/params.py
+++ b/app-packages/storm-v0_91/package/scripts/params.py
@@ -45,6 +45,7 @@ ganglia_installed = config['configurations']['global']['ganglia_enabled']
 if ganglia_installed:
   ganglia_report_interval = 60
   ganglia_server = config['configurations']['global']['ganglia_server_host']
+  ganglia_port = config['configurations']['global']['ganglia_server_port']
 
 _authentication = config['configurations']['core-site']['hadoop.security.authentication']
 security_enabled = ( not is_empty(_authentication) and _authentication == 'kerberos')

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8d49c272/app-packages/storm-v0_91/package/templates/config.yaml.j2
----------------------------------------------------------------------
diff --git a/app-packages/storm-v0_91/package/templates/config.yaml.j2 b/app-packages/storm-v0_91/package/templates/config.yaml.j2
index 89c8e67..32d2c99 100644
--- a/app-packages/storm-v0_91/package/templates/config.yaml.j2
+++ b/app-packages/storm-v0_91/package/templates/config.yaml.j2
@@ -35,7 +35,8 @@ ganglia:
   reportInterval: {{ganglia_report_interval}}
 
   # the hostname of the gmond server where storm cluster metrics will be sent
-  host: "{{ganglia_server}}"
+  host: {{ganglia_server}}
+  port: {{ganglia_port}}
 
   # address mode
   # default is MULTICAST