You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/02/18 16:29:46 UTC
git commit: AMBARI-4711 UI should read childopts for the server.
(Denys Buzhor via atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 1b213b46a -> 612da80cd
AMBARI-4711 UI should read childopts for the server. (Denys Buzhor via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/612da80c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/612da80c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/612da80c
Branch: refs/heads/trunk
Commit: 612da80cdd695c655b79d4540aff42df8b59f4f3
Parents: 1b213b4
Author: atkach <at...@hortonworks.com>
Authored: Tue Feb 18 17:29:40 2014 +0200
Committer: atkach <at...@hortonworks.com>
Committed: Tue Feb 18 17:29:40 2014 +0200
----------------------------------------------------------------------
.../HDP/2.1.1/services/STORM/configuration/storm-site.xml | 6 +++---
ambari-web/app/controllers/wizard/step7_controller.js | 10 +++-------
ambari-web/app/data/HDP2/site_properties.js | 6 +++---
3 files changed, 9 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/612da80c/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/configuration/storm-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/configuration/storm-site.xml
index 4a129e1..bd9f4e9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.1/services/STORM/configuration/storm-site.xml
@@ -118,7 +118,7 @@
</property>
<property>
<name>nimbus.childopts</name>
- <value></value>
+ <value>-Xmx1024m</value>
<description></description>
</property>
<property>
@@ -264,7 +264,7 @@
</property>
<property>
<name>supervisor.childopts</name>
- <value></value>
+ <value>-Xmx256m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=56431</value>
<description></description>
</property>
<property>
@@ -299,7 +299,7 @@
</property>
<property>
<name>worker.childopts</name>
- <value></value>
+ <value>-Xmx768m</value>
<description></description>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/612da80c/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 0c059b6..18ce9db 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -326,14 +326,10 @@ App.WizardStep7Controller = Em.Controller.extend({
if (this.get('installedServiceNames').contains('STORM') && this.get('installedServiceNames').contains('GANGLIA')) return;
if (this.get('allSelectedServiceNames').contains('GANGLIA') || this.get('installedServiceNames').contains('GANGLIA')) {
gangliaServerHost = this.get('wizardController').getDBProperty('masterComponentHosts').findProperty('component', 'GANGLIA_SERVER').hostName;
- dependentConfigs.forEach(function(configName){
+ dependentConfigs.forEach(function(configName) {
var config = configs.findProperty('name', configName);
- config.value = config.defaultValue.format(gangliaServerHost);
- }, this);
- } else {
- // if Ganglia not selected remove config
- dependentConfigs.forEach(function(configName){
- configs.removeAt(configs.indexOf(configs.findProperty('name', configName)));
+ var predefinedConfig = App.config.get('preDefinedSiteProperties').findProperty('name', configName);
+ config.value = config.value + " " + predefinedConfig.defaultValue.format(gangliaServerHost);
}, this);
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/612da80c/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 7a2eb62..41a013e 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -1027,7 +1027,7 @@ module.exports =
"name": "nimbus.childopts",
"displayName": "nimbus.childopts",
"description": "This parameter is used by the storm-deploy project to configure the jvm options for the nimbus daemon.",
- "defaultValue": "-javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host={0},port=8649,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM -Xmx1024m",
+ "defaultValue": "-javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host={0},port=8649,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",
"isReconfigurable": true,
"isOverridable": false,
"isVisible": false,
@@ -1183,7 +1183,7 @@ module.exports =
"category":"Supervisor",
"displayName":"supervisor.childopts",
"name":"supervisor.childopts",
- "defaultValue":"-javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host={0},port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM -Xmx256m",
+ "defaultValue":"-javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host={0},port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
"displayType":"string",
"filename": "storm-site.xml"
},
@@ -1411,7 +1411,7 @@ module.exports =
"category": "Advanced",
"displayName": "worker.childopts",
"name": "worker.childopts",
- "defaultValue": "-javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host={0},port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM -Xmx768m",
+ "defaultValue": "-javaagent:/usr/lib/storm/contrib/storm-jmxetric/lib/jmxetric-1.0.4.jar=host={0},port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM",
"displayType": "string",
"filename": "storm-site.xml"
},