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/01/20 13:00:39 UTC
git commit: AMBARI-4347 Capacity-scheduler properties loaded though
they are not supported. (atkach)
Updated Branches:
refs/heads/trunk 4ec6e63d8 -> 78b63993b
AMBARI-4347 Capacity-scheduler properties loaded though they are not supported. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/78b63993
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/78b63993
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/78b63993
Branch: refs/heads/trunk
Commit: 78b63993b11613d331b80cc69efc182b28213c32
Parents: 4ec6e63
Author: atkach <at...@hortonworks.com>
Authored: Mon Jan 20 14:00:32 2014 +0200
Committer: atkach <at...@hortonworks.com>
Committed: Mon Jan 20 14:00:32 2014 +0200
----------------------------------------------------------------------
ambari-web/app/utils/config.js | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/78b63993/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 50901e5..2f2d49e 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -704,8 +704,14 @@ App.config = Em.Object.create({
item.isVisible = item.type !== 'global.xml';
var serviceName = item.service_name;
var fileName = item.type;
- // If condition makes sure that mapred-queue-acls.xml configs are not shown in Mapreduce or Mapreduce2 service page Advanced section
- if (fileName !== 'mapred-queue-acls.xml' || App.supports.capacitySchedulerUi === true) {
+ var isHDP2 = App.get('isHadoop2Stack');
+ /**
+ * Properties from mapred-queue-acls.xml are ignored unless App.supports.capacitySchedulerUi is true
+ * Properties from capacity-scheduler.xml are ignored unless HDP stack version is 2.x or
+ * HDP stack version is 1.x and App.supports.capacitySchedulerUi is true.
+ */
+ if ((fileName !== 'mapred-queue-acls.xml' || App.supports.capacitySchedulerUi) &&
+ (fileName !== 'capacity-scheduler.xml' || isHDP2 || App.supports.capacitySchedulerUi)) {
properties.push({
serviceName: serviceName,
name: item.property_name,