Author: jaimin
Date: Tue Feb 26 02:00:06 2013
New Revision: 1449997
URL: http://svn.apache.org/r1449997
Log:
AMBARI-1496. Make all service properties reconfigurable. (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
incubator/ambari/trunk/ambari-web/app/data/config_properties.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1449997&r1=1449996&r2=1449997&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Feb 26 02:00:06 2013
@@ -63,6 +63,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1496. Make all service properties reconfigurable. (jaimin)
+
AMBARI-1477. Improve performance for App.statusMapper. (yusaku)
AMBARI-1484. Reintroduce client-side paging for Hosts table. (yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js?rev=1449997&r1=1449996&r2=1449997&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
Tue Feb 26 02:00:06 2013
@@ -537,9 +537,7 @@ App.MainServiceInfoConfigsController = E
var configs = this.get('stepConfigs').findProperty('serviceName',
this.get('content.serviceName')).get('configs');
this.saveGlobalConfigs(configs);
this.saveSiteConfigs(configs);
- var customConfigResult = this.setCustomConfigs();
- result.flag = customConfigResult.flag;
- result.value = customConfigResult.value;
+ this.setCustomConfigs();
/*
For now, we are skipping validation checks to see if the user is
overriding already-defined paramaters, as
the user needs this flexibility. We may turn this back on as a warning
in the future...
@@ -548,7 +546,7 @@ App.MainServiceInfoConfigsController = E
return result;
}
*/
- result.flag = result.flag && this.createConfigurations();
+ result.flag = this.createConfigurations();
if (result.flag === true) {
if (this.get('content.serviceName') !== 'HDFS') {
result.flag =
this.applyCreatedConfToService(this.get('content.serviceName'));
@@ -963,7 +961,6 @@ App.MainServiceInfoConfigsController = E
/**
* return custom comfig
- * @return {Object}
*/
setCustomConfigs: function () {
var site = this.get('stepConfigs').findProperty('serviceName',
this.get('content.serviceName')).get('configs').filterProperty('id',
'conf-site');
@@ -982,35 +979,11 @@ App.MainServiceInfoConfigsController = E
var key = matches[1];
var value = matches[2];
// Check that entered config is allowed to reconfigure
- if (this.get('uiConfigs').filterProperty('filename', _site.name +
'.xml').someProperty('name', key)) {
- var property = {
- siteProperty: null,
- displayNames: []
- };
- if (_site.name !== 'core-site') {
- property.siteProperty = key;
-
- if (this.get('configMapping').someProperty('name', key)) {
- this.setPropertyDisplayNames(property.displayNames,
this.get('configMapping').findProperty('name', key).templateName);
- }
- siteProperties.push(property);
- flag = false;
- } else {
- this.setSiteProperty(key, value, _site.name + '.xml');
- }
- } else if (flag) {
- this.setSiteProperty(key, value, _site.name + '.xml');
- }
+ this.setSiteProperty(key, value, _site.name + '.xml');
}
}, this);
}
}, this);
-
- var result = {
- flag: flag,
- value: siteProperties
- };
- return result;
},
/**
Modified: incubator/ambari/trunk/ambari-web/app/data/config_properties.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/config_properties.js?rev=1449997&r1=1449996&r2=1449997&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_properties.js Tue Feb 26
02:00:06 2013
@@ -1251,7 +1251,7 @@ module.exports =
{
"id": "puppet var",
"name": "tasktracker_hosts",
- "displayName": "TaskTracer hosts",
+ "displayName": "TaskTracker hosts",
"value": "",
"defaultValue": "",
"description": "The hosts that have been assigned to run TaskTracker",
