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/11/04 20:54:33 UTC
git commit: SLIDER-525. Storm app package for windows does not report
component status correctly
Repository: incubator-slider
Updated Branches:
refs/heads/develop 497399904 -> 6c015b089
SLIDER-525. Storm app package for windows does not report component status correctly
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6c015b08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6c015b08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6c015b08
Branch: refs/heads/develop
Commit: 6c015b089fdfca3e6b48e4e49a8af106196fc9e6
Parents: 4973999
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Nov 4 11:46:28 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Nov 4 11:46:28 2014 -0800
----------------------------------------------------------------------
app-packages/storm-win/appConfig-default.json | 2 +-
.../storm-win/configuration/storm-site.xml | 4 ++--
.../storm-win/package/scripts/params.py | 15 ---------------
.../storm-win/package/scripts/service.py | 2 ++
app-packages/storm-win/package/scripts/storm.py | 8 --------
.../storm-win/package/templates/config.yaml.j2 | 20 +++++++++++++++++++-
6 files changed, 24 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6c015b08/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 229bc1d..a77f00d 100644
--- a/app-packages/storm-win/appConfig-default.json
+++ b/app-packages/storm-win/appConfig-default.json
@@ -10,7 +10,6 @@
"site.global.app_user": "hadoop",
"site.global.app_root": "${AGENT_WORK_ROOT}/app/install/storm-${pkg.version}",
"site.global.user_group": "hadoop",
- "site.global.security_enabled": "false",
"site.storm-site.storm.log.dir" : "${AGENT_LOG_ROOT}",
"site.storm-site.storm.zookeeper.servers": "['${ZK_HOST}']",
@@ -20,6 +19,7 @@
"site.storm-site.storm.zookeeper.port": "2181",
"site.storm-site.nimbus.childopts": "-Xmx1024m",
"site.storm-site.worker.childopts": "-Xmx768m",
+ "site.storm-site.ui.childopts": "-Xmx768m",
"site.storm-site.dev.zookeeper.path": "${AGENT_WORK_ROOT}/app/tmp/dev-storm-zookeeper",
"site.storm-site.drpc.invocations.port": "0",
"site.storm-site.storm.zookeeper.root": "${DEFAULT_ZK_PATH}",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6c015b08/app-packages/storm-win/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/configuration/storm-site.xml b/app-packages/storm-win/configuration/storm-site.xml
index b3cce6a..86db125 100644
--- a/app-packages/storm-win/configuration/storm-site.xml
+++ b/app-packages/storm-win/configuration/storm-site.xml
@@ -188,7 +188,7 @@
</property>
<property>
<name>ui.childopts</name>
- <value>-Xmx768m -Djava.security.auth.login.config=/etc/storm/conf/storm_jaas.conf</value>
+ <value>-Xmx768m</value>
<description>Childopts for Storm UI Java process.</description>
</property>
<property>
@@ -264,7 +264,7 @@
</property>
<property>
<name>supervisor.childopts</name>
- <value>-Xmx256m -Djava.security.auth.login.config=/etc/storm/conf/storm_jaas.conf -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=56431 -javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM</value>
+ <value>-Xmx256m</value>
<description>This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.</description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6c015b08/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 3a458ea..21e5c65 100644
--- a/app-packages/storm-win/package/scripts/params.py
+++ b/app-packages/storm-win/package/scripts/params.py
@@ -37,18 +37,3 @@ nimbus_port = config['configurations']['storm-site']['nimbus.thrift.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")
-
-security_enabled = config['configurations']['global']['security_enabled']
-
-if security_enabled:
- _hostname_lowercase = config['hostname'].lower()
- _kerberos_domain = config['configurations']['storm-env']['kerberos_domain']
- _storm_client_principal_name = config['configurations']['storm-env']['storm_client_principal_name']
- _storm_server_principal_name = config['configurations']['storm-env']['storm_server_principal_name']
-
- storm_jaas_client_principal = _storm_client_principal_name.replace('_HOST', _hostname_lowercase)
- storm_client_keytab_path = config['configurations']['storm-env']['storm_client_keytab']
- storm_jaas_server_principal = _storm_server_principal_name.replace('_HOST',nimbus_host.lower())
- storm_jaas_stormclient_servicename = storm_jaas_server_principal.split("/")[0]
- storm_server_keytab_path = config['configurations']['storm-env']['storm_server_keytab']
- kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6c015b08/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 0ddfb47..b17c636 100644
--- a/app-packages/storm-win/package/scripts/service.py
+++ b/app-packages/storm-win/package/scripts/service.py
@@ -38,6 +38,8 @@ def service(
if action == "start":
os.environ['STORM_LOG_DIR'] = params.log_dir
+ os.environ['STORM_HOME'] = params.app_root
+ os.environ['STORM_CONF_DIR'] = params.conf_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/6c015b08/app-packages/storm-win/package/scripts/storm.py
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/package/scripts/storm.py b/app-packages/storm-win/package/scripts/storm.py
index e109826..e2e6465 100644
--- a/app-packages/storm-win/package/scripts/storm.py
+++ b/app-packages/storm-win/package/scripts/storm.py
@@ -43,11 +43,3 @@ def storm():
owner = params.storm_user,
group = params.user_group
)
-
- if params.security_enabled:
- File(format("{conf_dir}/storm_jaas.conf"),
- content=Template("storm_jaas.conf.j2"),
- owner = params.storm_user,
- group = params.user_group
- )
-
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6c015b08/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 eb68584..c3dd542 100644
--- a/app-packages/storm-win/package/templates/config.yaml.j2
+++ b/app-packages/storm-win/package/templates/config.yaml.j2
@@ -16,4 +16,22 @@
nimbusHost: {{nimbus_host}}
nimbusPort: {{nimbus_port}}
-enableGanglia: false
\ No newline at end of file
+enableGanglia: false
+
+# ganglia configuration
+ganglia:
+
+ # how often to report to ganglia metrics (in seconds)
+ reportInterval: 600
+
+ # the hostname of the gmond server where storm cluster metrics will be sent
+ host: localhost
+ port: 8649
+
+ # address mode
+ # default is MULTICAST
+ addressMode: "UNICAST"
+
+ # an <IP>:<HOSTNAME> pair to spoof
+ # this allows us to simulate storm cluster metrics coming from a specific host
+ #spoof: "192.168.1.1:storm"
\ No newline at end of file