You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/01/15 15:24:15 UTC
git commit: AMBARI-4295. STORM: Update configs for Nimbus and
Supervisor. (Denys Buzhor via alexantonenko)
Updated Branches:
refs/heads/trunk ad789bfe0 -> 736c5cf15
AMBARI-4295. STORM: Update configs for Nimbus and Supervisor. (Denys Buzhor via alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/736c5cf1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/736c5cf1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/736c5cf1
Branch: refs/heads/trunk
Commit: 736c5cf151f58c748fd9d1a018827502c47c8c62
Parents: ad789bf
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Jan 15 16:24:08 2014 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Jan 15 16:24:08 2014 +0200
----------------------------------------------------------------------
.../configurations/cluster_level_configs.json | 2 +-
.../app/controllers/wizard/step8_controller.js | 6 +-
ambari-web/app/data/HDP2/global_properties.js | 17 +----
ambari-web/app/data/HDP2/site_properties.js | 76 ++++++++++----------
ambari-web/app/models/service_config.js | 4 +-
ambari-web/app/utils/config.js | 6 ++
6 files changed, 57 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/736c5cf1/ambari-web/app/assets/data/configurations/cluster_level_configs.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/configurations/cluster_level_configs.json b/ambari-web/app/assets/data/configurations/cluster_level_configs.json
index 02492cd..8e958df 100644
--- a/ambari-web/app/assets/data/configurations/cluster_level_configs.json
+++ b/ambari-web/app/assets/data/configurations/cluster_level_configs.json
@@ -598,7 +598,7 @@
"storm.zookeeper.retry.intervalceiling.millis" : "30000",
"storm.zookeeper.retry.times" : "5",
"storm.zookeeper.root" : "/storm",
- "storm.zookeeper.servers" : "['localhost']",
+ "storm.zookeeper.servers" : "['localhost']",
"storm.zookeeper.session.timeout" : "20000",
"supervisor.childopts" : "-Xmx256m",
"supervisor.enable" : "true",
http://git-wip-us.apache.org/repos/asf/ambari/blob/736c5cf1/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index f70afe4..e689705 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1823,7 +1823,11 @@ App.WizardStep8Controller = Em.Controller.extend({
var configs = this.get('configs').filterProperty('filename', 'storm-site.xml');
var stormProperties = {};
configs.forEach(function (_configProperty) {
- stormProperties[_configProperty.name] = App.config.escapeXMLCharacters(_configProperty.value);
+ if (_configProperty.name == "storm.zookeeper.servers") {
+ stormProperties[_configProperty.name] = JSON.stringify(_configProperty.value).replace(/"/g, "'");
+ } else {
+ stormProperties[_configProperty.name] = App.config.escapeXMLCharacters(_configProperty.value);
+ }
this._recordHostOverrideFromObj(_configProperty, 'storm-site', 'version1', this);
}, this);
return {type: 'storm-site', tag: 'version1', properties: stormProperties};
http://git-wip-us.apache.org/repos/asf/ambari/blob/736c5cf1/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 41d66f5..427da9d 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -1287,25 +1287,12 @@ module.exports =
/**********************************************STORM***************************************/
{
"id": "puppet var",
- "name": "nimbus_host",
- "displayName": "Nimbus host",
- "description": "",
- "defaultValue": "",
- "displayType": "masterHost",
- "isReconfigurable": false,
- "isVisible": true,
- "isRequiredByAgent": true,
- "serviceName": "STORM",
- "category": "Nimbus"
- },
- {
- "id": "puppet var",
"name": "storm_log_dir",
"displayName": "storm_log_dir",
"description": "",
"defaultValue": "/var/log/storm",
"displayType": "directory",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -1318,7 +1305,7 @@ module.exports =
"description": "",
"defaultValue": "/var/run/storm",
"displayType": "directory",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
http://git-wip-us.apache.org/repos/asf/ambari/blob/736c5cf1/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 d0c3823..7fa126f 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -701,7 +701,7 @@ module.exports =
"displayName": "storm.zookeeper.root",
"description": "",
"defaultValue": "/storm",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"displayType": "directory",
"isVisible": true,
"isRequiredByAgent": true,
@@ -714,7 +714,7 @@ module.exports =
"displayName": "storm.local.dir",
"description": "",
"defaultValue": "storm-local",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -726,6 +726,8 @@ module.exports =
"displayName": "storm.zookeeper.servers",
"description": "",
"defaultValue": "",
+ "displayType": "masterHosts",
+ "isOverridable": false,
"isReconfigurable": false,
"isVisible": true,
"isRequiredByAgent": true,
@@ -738,7 +740,7 @@ module.exports =
"displayName": "storm.zookeeper.port",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"displayType": "int",
"isVisible": true,
"isRequiredByAgent": true,
@@ -751,7 +753,7 @@ module.exports =
"displayName": "storm.zookeeper.session.timeout",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"displayType": "int",
"isVisible": true,
"isRequiredByAgent": true,
@@ -764,7 +766,7 @@ module.exports =
"displayName": "storm.zookeeper.connection.timeout",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"displayType": "int",
"isVisible": true,
"isRequiredByAgent": true,
@@ -777,7 +779,7 @@ module.exports =
"displayName": "storm.zookeeper.retry.times",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"displayType": "int",
"isVisible": true,
"isRequiredByAgent": true,
@@ -790,7 +792,7 @@ module.exports =
"displayName": "storm.zookeeper.retry.interval",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"displayType": "int",
"isVisible": true,
"isRequiredByAgent": true,
@@ -803,7 +805,7 @@ module.exports =
"displayName": "storm.zookeeper.retry.intervalceiling.millis",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"displayType": "int",
"isVisible": true,
"isRequiredByAgent": true,
@@ -816,7 +818,7 @@ module.exports =
"displayName": "storm.cluster.mode",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -828,7 +830,7 @@ module.exports =
"displayName": "storm.local.mode.zmq",
"description": "",
"defaultValue": false,
- "isReconfigurable": false,
+ "isReconfigurable": true,
"displayType": "checkbox",
"isVisible": true,
"isRequiredByAgent": true,
@@ -841,7 +843,7 @@ module.exports =
"displayName": "storm.thrift.transport",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -853,7 +855,7 @@ module.exports =
"displayName": "storm.messaging.transport",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -862,7 +864,7 @@ module.exports =
{
"id":"site property",
"description":"",
- "isReconfigurable":false,
+ "isReconfigurable": true,
"isVisible":true,
"isRequiredByAgent":true,
"serviceName":"STORM",
@@ -875,7 +877,7 @@ module.exports =
{
"id":"site property",
"description":"",
- "isReconfigurable":false,
+ "isReconfigurable": true,
"isVisible":true,
"isRequiredByAgent":true,
"serviceName":"STORM",
@@ -888,7 +890,7 @@ module.exports =
{
"id":"site property",
"description":"",
- "isReconfigurable":false,
+ "isReconfigurable": true,
"isVisible":true,
"isRequiredByAgent":true,
"serviceName":"STORM",
@@ -901,7 +903,7 @@ module.exports =
{
"id":"site property",
"description":"",
- "isReconfigurable":false,
+ "isReconfigurable": true,
"isVisible":true,
"isRequiredByAgent":true,
"serviceName":"STORM",
@@ -917,6 +919,8 @@ module.exports =
"displayName": "nimbus.host",
"description": "",
"defaultValue": "",
+ "displayType": "masterHost",
+ "isOverridable": false,
"isReconfigurable": false,
"isVisible": true,
"isRequiredByAgent": true,
@@ -929,7 +933,7 @@ module.exports =
"displayName": "nimbus.thrift.port",
"description": "",
"defaultValue": "6627",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"displayType": "int",
"isVisible": true,
"isRequiredByAgent": true,
@@ -942,7 +946,7 @@ module.exports =
"displayName": "nimbus.childopts",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -955,7 +959,7 @@ module.exports =
"description": "",
"defaultValue": "",
"displayType": "int",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -968,7 +972,7 @@ module.exports =
"description": "",
"defaultValue": "",
"displayType": "int",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -981,7 +985,7 @@ module.exports =
"description": "",
"defaultValue": "",
"displayType": "int",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -994,7 +998,7 @@ module.exports =
"description": "",
"defaultValue": "",
"displayType": "int",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -1007,7 +1011,7 @@ module.exports =
"description": "",
"defaultValue": "",
"displayType": "int",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -1020,7 +1024,7 @@ module.exports =
"description": "",
"defaultValue": "",
"displayType": "int",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -1033,7 +1037,7 @@ module.exports =
"description": "",
"defaultValue": true,
"displayType": "checkbox",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -1046,7 +1050,7 @@ module.exports =
"description": "",
"defaultValue": "",
"displayType": "int",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -1058,7 +1062,7 @@ module.exports =
"displayName": "nimbus.topology.validator",
"description": "",
"defaultValue": "",
- "isReconfigurable": false,
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -1070,8 +1074,8 @@ module.exports =
"displayName": "supervisor.slots.ports",
"description": "",
"defaultValue": "",
- "displayType": "multiLine",
- "isReconfigurable": false,
+ "displayType": "string",
+ "isReconfigurable": true,
"isVisible": true,
"isRequiredByAgent": true,
"serviceName": "STORM",
@@ -1080,7 +1084,7 @@ module.exports =
{
"id":"site property",
"description":"",
- "isReconfigurable":false,
+ "isReconfigurable": true,
"isVisible":true,
"isRequiredByAgent":true,
"serviceName":"STORM",
@@ -1093,7 +1097,7 @@ module.exports =
{
"id":"site property",
"description":"",
- "isReconfigurable":false,
+ "isReconfigurable": true,
"isVisible":true,
"isRequiredByAgent":true,
"serviceName":"STORM",
@@ -1106,7 +1110,7 @@ module.exports =
{
"id":"site property",
"description":"",
- "isReconfigurable":false,
+ "isReconfigurable": true,
"isVisible":true,
"isRequiredByAgent":true,
"serviceName":"STORM",
@@ -1119,7 +1123,7 @@ module.exports =
{
"id":"site property",
"description":"",
- "isReconfigurable":false,
+ "isReconfigurable": true,
"isVisible":true,
"isRequiredByAgent":true,
"serviceName":"STORM",
@@ -1132,7 +1136,7 @@ module.exports =
{
"id":"site property",
"description":"",
- "isReconfigurable":false,
+ "isReconfigurable": true,
"isVisible":true,
"isRequiredByAgent":true,
"serviceName":"STORM",
@@ -1145,9 +1149,9 @@ module.exports =
{
"id":"site property",
"description":"",
- "isReconfigurable":false,
+ "isReconfigurable":true,
"isVisible":true,
- "isRequiredByAgent":true,
+ "isRequiredByAgent": true,
"serviceName":"STORM",
"category":"Supervisor",
"displayName":"supervisor.enable",
http://git-wip-us.apache.org/repos/asf/ambari/blob/736c5cf1/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 0d527b4..a875265 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -390,10 +390,12 @@ App.ServiceConfigProperty = Ember.Object.extend({
case 'oozie_ambari_host':
this.set('value', masterComponentHostsInDB.findProperty('component', 'OOZIE_SERVER').hostName);
break;
+ case 'storm.zookeeper.servers':
+ if (!App.supports.storm) return;
case 'zookeeperserver_hosts':
this.set('value', masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName'));
break;
- case 'nimbus_host':
+ case 'nimbus.host':
if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration
this.set('value', masterComponentHostsInDB.findProperty('component', 'NIMBUS').hostName);
break;
http://git-wip-us.apache.org/repos/asf/ambari/blob/736c5cf1/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 785d95f..50901e5 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -287,6 +287,12 @@ App.config = Em.Object.create({
serviceConfigObj.set('value', dirs[0]);
serviceConfigObj.set('defaultValue', dirs[0]);
}
+ if (serviceConfigObj.get('displayType') == 'masterHosts') {
+ if (typeof(serviceConfigObj.get('value')) == 'string') {
+ var value = serviceConfigObj.get('value').replace(/\[|]|'|'/g, "").split(',');
+ serviceConfigObj.set('value', value);
+ }
+ }
configs.push(serviceConfigObj);
} else {
mappingConfigs.push(serviceConfigObj);