You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2013/12/05 16:35:05 UTC
git commit: AMBARI-3986. YARN and MapReduce2 configs is not
displayed. (Denis Buzhor via onechiporenko)
Updated Branches:
refs/heads/trunk 3408cfec8 -> 107aa5808
AMBARI-3986. YARN and MapReduce2 configs is not displayed. (Denis Buzhor via onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/107aa580
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/107aa580
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/107aa580
Branch: refs/heads/trunk
Commit: 107aa58083e2eaff8f43f3b5ee7ade4eecb07bd4
Parents: 3408cfe
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Thu Dec 5 17:34:29 2013 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Thu Dec 5 17:34:59 2013 +0200
----------------------------------------------------------------------
.../app/views/common/configs/services_config.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/107aa580/ambari-web/app/views/common/configs/services_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/services_config.js b/ambari-web/app/views/common/configs/services_config.js
index 942b79c..99f0ae9 100644
--- a/ambari-web/app/views/common/configs/services_config.js
+++ b/ambari-web/app/views/common/configs/services_config.js
@@ -853,12 +853,14 @@ App.ServiceConfigCapacityScheduler = App.ServiceConfigsByCategoryView.extend({
*/
getUserAndGroupNames: function(queueName){
queueName = queueName || '<queue-name>';
- if(App.config.get('isHDP2')){
- return ['yarn.scheduler.capacity.root.' + queueName + '.acl_submit_jobs',
- 'yarn.scheduler.capacity.root.' + queueName + '.acl_administer_jobs']
+ if(App.get('isHadoop2Stack') && this.get('controller.selectedService')) {
+ if (this.get('controller.selectedService.serviceName') == "YARN") {
+ return ['yarn.scheduler.capacity.root.' + queueName + '.acl_submit_jobs',
+ 'yarn.scheduler.capacity.root.' + queueName + '.acl_administer_jobs']
+ }
+ return ['mapred.queue.' + queueName + '.acl-submit-job',
+ 'mapred.queue.' + queueName + '.acl-administer-jobs']
}
- return ['mapred.queue.' + queueName + '.acl-submit-job',
- 'mapred.queue.' + queueName + '.acl-administer-jobs']
},
generateColor: function (str) {
var hash = 0;
@@ -944,7 +946,7 @@ App.ServiceConfigCapacityScheduler = App.ServiceConfigsByCategoryView.extend({
var admin = [];
var submit = [];
//comparison executes including 'queue.<queue-name>' to avoid false matches
- var queueNamePrefix = App.config.get('isHDP2') ? 'root.' : 'queue.';
+ var queueNamePrefix = App.get('isHadoop2Stack') ? 'root.' : 'queue.';
if (configNames.contains(_config.get('name'))) {
if(configName == this.getUserAndGroupNames(queue.name)[0]){
submit = queue.configs.filterProperty('name', configName);