Author: yusaku
Date: Thu Apr 18 04:50:46 2013
New Revision: 1469160
URL: http://svn.apache.org/r1469160
Log:
AMBARI-1965. core-site properties are incorrectly populated in Advanced/General
category of MapReduce service. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/templates/common/configs/service_config.hbs
incubator/ambari/trunk/ambari-web/app/utils/config.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1469160&r1=1469159&r2=1469160&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr 18 04:50:46 2013
@@ -752,6 +752,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1965. core-site properties are incorrectly populated in Advanced/
+ General category of MapReduce service. (yusaku)
+
AMBARI-1963. Deploying progress bar shows 0 tasks after installation failure
and going back to a previous step to retry. (yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/templates/common/configs/service_config.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/common/configs/service_config.hbs?rev=1469160&r1=1469159&r2=1469160&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/templates/common/configs/service_config.hbs
(original)
+++
incubator/ambari/trunk/ambari-web/app/templates/common/configs/service_config.hbs
Thu Apr 18 04:50:46 2013
@@ -49,7 +49,7 @@
<div class="accordion">
{{#each category in selectedService.configCategories}}
{{#if category.isCustomView}}
- {{#if App.supports.capacityScheduler}}
+ {{#if App.supports.capacitySchedulerUi}}
{{view category.customView categoryBinding="category"
serviceBinding="selectedService" canEditBinding="view.canEdit"
serviceConfigsBinding="selectedService.configs"}}
{{/if}}
{{else}}
Modified: incubator/ambari/trunk/ambari-web/app/utils/config.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/config.js?rev=1469160&r1=1469159&r2=1469160&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/config.js Thu Apr 18 04:50:46
2013
@@ -105,7 +105,8 @@ App.config = Em.Object.create({
defaultValue: properties[index],
filename: _tag.siteName + ".xml",
isUserProperty: false,
- isOverridable: true
+ isOverridable: true,
+ serviceName: serviceName
};
if (configsPropertyDef) {
@@ -116,6 +117,10 @@ App.config = Em.Object.create({
serviceConfigObj.unit = (configsPropertyDef.unit !== undefined) ?
configsPropertyDef.unit : undefined;
serviceConfigObj.description = (configsPropertyDef.description !==
undefined) ? configsPropertyDef.description : undefined;
serviceConfigObj.isOverridable = configsPropertyDef.isOverridable
=== undefined ? true : configsPropertyDef.isOverridable;
+ serviceConfigObj.serviceName = configsPropertyDef ?
configsPropertyDef.serviceName : null;
+ }
+ if(serviceConfigObj.serviceName === 'MAPREDUCE' &&
serviceConfigObj.filename === 'core-site.xml'){
+ serviceConfigObj.isVisible = false;
}
if (_tag.siteName === 'global') {
if (configsPropertyDef) {
@@ -140,7 +145,6 @@ App.config = Em.Object.create({
}
}
serviceConfigObj.id = 'puppet var';
- serviceConfigObj.serviceName = configsPropertyDef ?
configsPropertyDef.serviceName : null;
serviceConfigObj.displayName = configsPropertyDef ?
configsPropertyDef.displayName : null;
serviceConfigObj.category = configsPropertyDef ?
configsPropertyDef.category : null;
serviceConfigObj.options = configsPropertyDef ?
configsPropertyDef.options : null;
@@ -150,7 +154,6 @@ App.config = Em.Object.create({
serviceConfigObj.id = 'site property';
serviceConfigObj.displayType = 'advanced';
serviceConfigObj.displayName = configsPropertyDef ?
configsPropertyDef.displayName : index;
- serviceConfigObj.serviceName = serviceName;
if (!isAdvanced ||
this.get('customFileNames').contains(serviceConfigObj.filename)) {
var categoryMetaData = this.identifyCategory(serviceConfigObj);
if (categoryMetaData != null) {
@@ -231,6 +234,7 @@ App.config = Em.Object.create({
configData = preDefined;
if (isAdvanced) {
configData.category = (configData.category === undefined) ?
configCategory : configData.category;
+ configData.filename = advancedConfigs.findProperty('name',
configData.name).filename;
}
}
mergedConfigs.push(configData);
