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/06 01:36:29 UTC
git commit: Modify few default values for Storm Windows package
Repository: incubator-slider
Updated Branches:
refs/heads/develop 4e4652e4b -> 9f5dbb467
Modify few default values for Storm Windows 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/9f5dbb46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9f5dbb46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9f5dbb46
Branch: refs/heads/develop
Commit: 9f5dbb4672dae2d1727f851dd15d3c9facdc0560
Parents: 4e4652e
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Wed Nov 5 16:36:06 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Nov 5 16:36:06 2014 -0800
----------------------------------------------------------------------
app-packages/storm-win/configuration/storm-site.xml | 4 ++--
app-packages/storm/appConfig-secured-default.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9f5dbb46/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 86db125..c09e29b 100644
--- a/app-packages/storm-win/configuration/storm-site.xml
+++ b/app-packages/storm-win/configuration/storm-site.xml
@@ -118,7 +118,7 @@
</property>
<property>
<name>nimbus.childopts</name>
- <value>-Xmx1024m -Djava.security.auth.login.config=/etc/storm/conf/storm_jaas.conf -javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=localhost,port=8649,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM</value>
+ <value>-Xmx1024m</value>
<description>This parameter is used by the storm-deploy project to configure the jvm options for the nimbus daemon.</description>
</property>
<property>
@@ -292,7 +292,7 @@
</property>
<property>
<name>worker.childopts</name>
- <value>-Xmx768m -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=Worker_%ID%_JVM</value>
+ <value>-Xmx768m</value>
<description>The jvm opts provided to workers launched by this supervisor. All \"%ID%\" substrings are replaced with an identifier for this worker.</description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9f5dbb46/app-packages/storm/appConfig-secured-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-secured-default.json b/app-packages/storm/appConfig-secured-default.json
index bd7ac59..ec42acd 100644
--- a/app-packages/storm/appConfig-secured-default.json
+++ b/app-packages/storm/appConfig-secured-default.json
@@ -50,7 +50,7 @@
"site.storm-site.ui.filter.params": "{'type': 'kerberos', 'kerberos.principal': 'HTTP/_HOST', 'kerberos.keytab': '/etc/security/keytabs/spnego.service.keytab', 'kerberos.name.rules': 'RULE:[2:$1@$0]([jt]t@.*EXAMPLE.COM)s/.*/$MAPRED_USER/ RULE:[2:$1@$0]([nd]n@.*EXAMPLE.COM)s/.*/$HDFS_USER/DEFAULT'}",
"site.storm-env.kerberos_domain": "EXAMPLE.COM",
- "site.storm-env.storm_client_principal_name": "PLACE_JAAS_STORMCLIENT_PRINCIPAL_HERE/_HOST",
+ "site.storm-env.storm_client_principal_name": "PLACE_JAAS_STORMCLIENT_PRINCIPAL_HERE",
"site.storm-env.storm_server_principal_name": "PLACE_JAAS_STORMSERVER_PRINCIPAL_HERE/_HOST",
"site.storm-env.storm_client_keytab": "${AGENT_WORK_ROOT}/keytabs/${USER_NAME}.STORM.client.keytab",
"site.storm-env.storm_server_keytab": "${AGENT_WORK_ROOT}/keytabs/${USER_NAME}.STORM.nimbus.keytab"