AMBARI-1876. Capacity Scheduler: implement user/group and admin user/group validation rules. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1467022 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -241,6 +241,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-1876. Capacity Scheduler: implement user/group and admin user/group
+ validation rules. (yusaku)
+
  AMBARI-1864. Remove package dependency on mocha-phantomjs. (yusaku)
 
  AMBARI-1844. Need ability to update multiple hosts in 1 PUT call.

ambari-web/app/assets/data/configurations/cluster_level_configs.json

@@ -143,10 +143,10 @@
         "cluster_name" : "vmc"
       },
       "properties" : {
-        "mapred.queue.default.acl-submit-job" : "* *",
-        "mapred.queue.default.acl-administer-jobs" : "* *",
-        "mapred.queue.new_qeuue.acl-administer-jobs" : "* *",
-        "mapred.queue.new_qeuue.acl-submit-job" : "* *"
+        "mapred.queue.default.acl-submit-job" : "*",
+        "mapred.queue.default.acl-administer-jobs" : "*",
+        "mapred.queue.new_qeuue.acl-administer-jobs" : "*",
+        "mapred.queue.new_qeuue.acl-submit-job" : "*"
       }
     },
     {

ambari-web/app/models/service_config.js

@@ -474,7 +474,11 @@ App.ServiceConfigProperty = Ember.Object.extend({
             values = value.split(',');
             for(var i = 0, l = values.length; i < l; i++){
               if(!validator.isValidUNIXUser(values[i])){
-                this.set('errorMessage', 'Must be a valid list of user names');
+                if(this.get('type') == 'USERS'){
+                  this.set('errorMessage', 'Must be a valid list of user names');
+                } else {
+                  this.set('errorMessage', 'Must be a valid list of group names');
+                }
                 isError = true;
               }
             }

ambari-web/app/utils/config.js

@@ -172,7 +172,7 @@ App.config = Em.Object.create({
    */
   mergePreDefinedWithStored: function (storedConfigs) {
     var mergedConfigs = [];
-    var preDefinedConfigs = this.get('preDefinedConfigProperties');
+    var preDefinedConfigs = $.extend(true, [], this.get('preDefinedConfigProperties'));
     var preDefinedNames = [];
     var storedNames = [];
     var names = [];
@@ -314,10 +314,10 @@ App.config = Em.Object.create({
         customConfig.value = 'false';
         break;
       case 'mapred.queue.' + queueName + '.acl-submit-job':
-        customConfig.value = '* *';
+        customConfig.value = '*';
         break;
       case 'mapred.queue.' + queueName + '.acl-administer-jobs':
-        customConfig.value = '* *';
+        customConfig.value = '*';
         break;
     }
   },
@@ -477,7 +477,7 @@ App.config = Em.Object.create({
           name: item.property_name,
           value: item.property_value,
           description: item.property_description,
-          filename: item.filename
+          filename: item.filename || item.type
         });
       }, this);
       serviceComponents[data.items[0].StackConfigurations.service_name] = properties;

ambari-web/app/views/common/configs/services_config.js

@@ -994,6 +994,7 @@ App.ServiceConfigCapacityScheduler = App.ServiceConfigsByCategoryView.extend({
        * @return {*}
        */
       insertExtraConfigs: function(content){
+        var that = this;
         var admin = content.configs.findProperty('name', 'mapred.queue.' + content.name + '.acl-administer-jobs').get('value');
         var submit = content.configs.findProperty('name', 'mapred.queue.' + content.name + '.acl-submit-job').get('value');
         admin = (admin) ? admin.split(' ') : [''];
@@ -1044,7 +1045,8 @@ App.ServiceConfigCapacityScheduler = App.ServiceConfigsByCategoryView.extend({
         });
         newField.validate();
         content.configs.unshift(newField);
-        newField = App.ServiceConfigProperty.create({
+
+        var submitUser = App.ServiceConfigProperty.create({
           name: 'mapred.queue.' + content.name + '.acl-submit-job',
           displayName: Em.I18n.t('common.users'),
           value: submit[0],
@@ -1055,22 +1057,8 @@ App.ServiceConfigCapacityScheduler = App.ServiceConfigsByCategoryView.extend({
           displayType: "UNIXList",
           index: 3
         });
-        newField.validate();
-        content.configs.push(newField);
-        newField = App.ServiceConfigProperty.create({
-          name: 'mapred.queue.' + content.name + '.acl-administer-jobs',
-          displayName: Em.I18n.t('services.mapReduce.config.queue.adminUsers'),
-          description: Em.I18n.t('services.mapReduce.description.queue.admin.user'),
-          value: admin[0],
-          isRequired: true,
-          isVisible: true,
-          type: 'USERS',
-          displayType: "UNIXList",
-          index: 5
-        });
-        newField.validate();
-        content.configs.push(newField);
-        newField = App.ServiceConfigProperty.create({
+
+        var submitGroup = App.ServiceConfigProperty.create({
           name: 'mapred.queue.' + content.name + '.acl-submit-job',
           displayName: Em.I18n.t('services.mapReduce.config.queue.groups'),
           description: Em.I18n.t('services.mapReduce.description.queue.submit.group'),
@@ -1081,9 +1069,20 @@ App.ServiceConfigCapacityScheduler = App.ServiceConfigsByCategoryView.extend({
           type: 'GROUPS',
           index: 4
         });
-        newField.validate();
-        content.configs.push(newField);
-        newField = App.ServiceConfigProperty.create({
+
+        var adminUser = App.ServiceConfigProperty.create({
+          name: 'mapred.queue.' + content.name + '.acl-administer-jobs',
+          displayName: Em.I18n.t('services.mapReduce.config.queue.adminUsers'),
+          description: Em.I18n.t('services.mapReduce.description.queue.admin.user'),
+          value: admin[0],
+          isRequired: true,
+          isVisible: true,
+          type: 'USERS',
+          displayType: "UNIXList",
+          index: 5
+        });
+
+        var adminGroup = App.ServiceConfigProperty.create({
           name: 'mapred.queue.' + content.name + '.acl-administer-jobs',
           displayName: Em.I18n.t('services.mapReduce.config.queue.adminGroups'),
           value: admin[1],
@@ -1094,10 +1093,42 @@ App.ServiceConfigCapacityScheduler = App.ServiceConfigsByCategoryView.extend({
           type: 'GROUPS',
           index: 6
         });
-        newField.validate();
-        content.configs.push(newField);
+
+        submitUser.reopen({
+          validate: function(){
+            that.userGroupValidation(this, submitGroup);
+          }.observes('value')
+        });
+        submitGroup.reopen({
+          validate: function(){
+            that.userGroupValidation(this, submitUser);
+          }.observes('value')
+        });
+        adminUser.reopen({
+          validate: function(){
+            that.userGroupValidation(this, adminGroup);
+          }.observes('value')
+        });
+        adminGroup.reopen({
+          validate: function(){
+            that.userGroupValidation(this, adminUser);
+          }.observes('value')
+        });
+
+        submitUser.validate();
+        adminUser.validate();
+        content.configs.push(submitUser);
+        content.configs.push(submitGroup);
+        content.configs.push(adminUser);
+        content.configs.push(adminGroup);
+
         return content;
       },
+      /**
+       * sort properties of queue by index
+       * @param configs
+       * @return {Array}
+       */
       sortQueueProperties: function(configs){
         var sortedConfigs = [];
         var skippedConfigs = [];
@@ -1109,6 +1140,27 @@ App.ServiceConfigCapacityScheduler = App.ServiceConfigsByCategoryView.extend({
           }
         });
         return sortedConfigs.concat(skippedConfigs);
+      },
+      /**
+       * Validate by follow rules:
+       * Users can be blank. If this is blank, Groups must not be blank.
+       * Groups can be blank. If this is blank, Users must not be blank.
+       * @param context
+       * @param boundConfig
+       */
+      userGroupValidation:  function(context, boundConfig){
+        if(context.get('value') == ''){
+          if(boundConfig.get('value') == ''){
+            context._super();
+          } else {
+            boundConfig.validate();
+          }
+        } else {
+          if(boundConfig.get('value') == ''){
+            boundConfig.set('errorMessage', '');
+          }
+          context._super();
+        }
       }
     })
   }