Repository: ambari Updated Branches: refs/heads/trunk 08dc84acb -> 37137ac96
AMBARI-4865: Storm properties for Java opts should be visible and retrieved from server. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/37137ac9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/37137ac9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/37137ac9 Branch: refs/heads/trunk Commit: 37137ac969ac10313ebcbeaf024b446c19c5cca1 Parents: 08dc84a Author: Jaimin Jetly <[email protected]> Authored: Fri Feb 28 13:13:08 2014 -0800 Committer: Jaimin Jetly <[email protected]> Committed: Fri Feb 28 13:14:34 2014 -0800 ---------------------------------------------------------------------- .../services/STORM/configuration/storm-site.xml | 12 ++++---- .../app/controllers/wizard/step7_controller.js | 3 +- ambari-web/app/data/HDP2/global_properties.js | 2 +- ambari-web/app/data/HDP2/site_properties.js | 29 ++++---------------- 4 files changed, 15 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/37137ac9/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 bd9f4e9..f49d6ce 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,8 +118,8 @@ </property> <property> <name>nimbus.childopts</name> - <value>-Xmx1024m</value> - <description></description> + <value>-Xmx1024m -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</value> + <description>This parameter is used by the storm-deploy project to configure the jvm options for the nimbus daemon.</description> </property> <property> <name>nimbus.task.timeout.secs</name> @@ -264,8 +264,8 @@ </property> <property> <name>supervisor.childopts</name> - <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> + <value>-Xmx256m -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={0},port=8650,wireformat31x=true,mode=multicast,config=/usr/lib/storm/contrib/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM</value> + <description>This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.</description> </property> <property> <name>supervisor.worker.start.timeout.secs</name> @@ -299,8 +299,8 @@ </property> <property> <name>worker.childopts</name> - <value>-Xmx768m</value> - <description></description> + <value>-Xmx768m -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</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> <name>worker.heartbeat.frequency.secs</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/37137ac9/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 d360cf9..8170ba1 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -333,10 +333,11 @@ App.WizardStep7Controller = Em.Controller.extend({ dependentConfigs.forEach(function(configName) { var config = configs.findProperty('name', configName); var predefinedConfig = App.config.get('preDefinedSiteProperties').findProperty('name', configName); - config.value = config.value + " " + predefinedConfig.defaultValue.format(gangliaServerHost); + config.value = config.defaultValue = config.value.format(gangliaServerHost); }, this); } }, + /** * On load function */ http://git-wip-us.apache.org/repos/asf/ambari/blob/37137ac9/ambari-web/app/data/HDP2/global_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js index d4c5103..742c2fa 100644 --- a/ambari-web/app/data/HDP2/global_properties.js +++ b/ambari-web/app/data/HDP2/global_properties.js @@ -1476,7 +1476,7 @@ module.exports = "displayName": "Supervisor hosts", "description": "The host that has been assigned to run Supervisor", "defaultValue": "", - "displayType": "masterHosts", + "displayType": "slaveHosts", "isReconfigurable": false, "isVisible": true, "isRequiredByAgent": false, http://git-wip-us.apache.org/repos/asf/ambari/blob/37137ac9/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 909f8ad..77a07e1 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -39,7 +39,6 @@ module.exports = "displayName": "HDFS Maximum Checkpoint Delay", "displayType": "int", "unit": "seconds", - "isVisible": true, "category": "General", "serviceName": "HDFS", "index": 3 @@ -70,7 +69,6 @@ module.exports = "name": "dfs.datanode.failed.volumes.tolerated", "displayName": "DataNode volumes failure toleration", "displayType": "int", - "isVisible": true, "category": "DataNode", "serviceName": "HDFS", "index": 3 @@ -370,9 +368,8 @@ module.exports = }, { "id": "site property", - "name": "oozie.service.JPAService.jdbc.driver", + "name": "oozie.service.JPAService.jdbc.driver", // the default value of this property is overriden in code "displayName": "JDBC Driver Class", - "value": "", // the value is overwritten in code "isOverridable": false, "category": "Oozie Server", "serviceName": "OOZIE", @@ -392,9 +389,8 @@ module.exports = /**********************************************hive-site***************************************/ { "id": "site property", - "name": "javax.jdo.option.ConnectionDriverName", + "name": "javax.jdo.option.ConnectionDriverName", // the default value is overwritten in code "displayName": "JDBC Driver Class", - "value": "", // the value is overwritten in code "isOverridable": false, "category": "Hive Metastore", "serviceName": "HIVE", @@ -749,6 +745,7 @@ module.exports = { "id": "site property", "name": "nimbus.host", + "displayName": "nimbus.host", "displayType": "masterHost", "isOverridable": false, "serviceName": "STORM", @@ -759,8 +756,6 @@ module.exports = "name": "nimbus.thrift.port", "displayName": "nimbus.thrift.port", "displayType": "int", - "isVisible": true, - "isRequiredByAgent": true, "serviceName": "STORM", "category": "Nimbus" }, @@ -777,12 +772,8 @@ module.exports = "id": "site property", "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", - "isReconfigurable": true, + "displayType": "multiLine", "isOverridable": false, - "isVisible": false, - "isRequiredByAgent": true, "serviceName": "STORM", "category": "Nimbus", "filename": "storm-site.xml" @@ -876,15 +867,12 @@ module.exports = }, { "id": "site property", - "description": "This parameter is used by the storm-deploy project to configure the jvm options for the supervisor daemon.", - "isVisible": false, "isOverrideable": false, "serviceName": "STORM", "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", - "displayType": "string", + "displayType": "multiLine", "filename": "storm-site.xml" }, { @@ -1022,16 +1010,11 @@ module.exports = }, { "id": "site property", - "description": "The jvm opts provided to workers launched by this supervisor. All \"%ID%\" substrings are replaced with an identifier for this worker.", - "isReconfigurable": true, - "isVisible": false, - "isOverridable": false, "serviceName": "STORM", "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", - "displayType": "string", + "displayType": "multiLine", "filename": "storm-site.xml" }, /*********************************************oozie-site for Falcon*****************************/
