ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject ambari git commit: AMBARI-11976 hbase.coprocessor.regionserver.classes should allow blank as a valid value. (ababiichuk)
Date Wed, 17 Jun 2015 16:13:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk ca2031282 -> 5306e0d20


AMBARI-11976 hbase.coprocessor.regionserver.classes should allow blank as a valid value. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5306e0d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5306e0d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5306e0d2

Branch: refs/heads/trunk
Commit: 5306e0d20a1839f8e0b951ddfdd345a1316c6739
Parents: ca20312
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Wed Jun 17 19:11:58 2015 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Wed Jun 17 19:13:26 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/data/HDP2/site_properties.js              | 9 +++++++++
 ambari-web/app/mixins/common/configs/enhanced_configs.js | 8 ++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5306e0d2/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index ebdbb18..ccea488 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -852,6 +852,15 @@ var hdp2properties = [
   },
   {
     "id": "site property",
+    "name": "hbase.coprocessor.regionserver.classes",
+    "displayName": "hbase.coprocessor.regionserver.classes",
+    "category": "Advanced hbase-site",
+    "isRequired": false,
+    "serviceName": "HBASE",
+    "filename": "hbase-site.xml"
+  },
+  {
+    "id": "site property",
     "name": "hbase.zookeeper.quorum",
     "displayName": "hbase.zookeeper.quorum",
     "displayType": "multiLine",

http://git-wip-us.apache.org/repos/asf/ambari/blob/5306e0d2/ambari-web/app/mixins/common/configs/enhanced_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index f530b27..5e57e7c 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -595,6 +595,10 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
           if (Em.get(propertyToAdd, 'isDeleted')) {
             this.get('_dependentConfigValues').removeObject(propertyToAdd);
           }
+          var originalFileName = App.config.getOriginalFileName(Em.get(propertyToAdd, 'fileName'));
+          var predefinedProperty = App.config.get('preDefinedSiteProperties')
+                .filterProperty('filename', originalFileName)
+                .findProperty('name', Em.get(propertyToAdd, 'propertyName'));
           var addedProperty = App.ServiceConfigProperty.create({
             name: Em.get(propertyToAdd, 'propertyName'),
             displayName: Em.get(propertyToAdd, 'propertyName'),
@@ -603,9 +607,9 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
             savedValue: null,
             category: 'Advanced ' + Em.get(propertyToAdd, 'fileName'),
             serviceName: stepConfigs.get('serviceName'),
-            filename: App.config.getOriginalFileName(Em.get(propertyToAdd, 'fileName')),
+            filename: originalFileName,
             isNotSaved: !Em.get(propertyToAdd, 'isDeleted'),
-            isRequired: true
+            isRequired:  predefinedProperty ? Em.getWithDefault(predefinedProperty, 'isRequired',
true) : true
           });
           stepConfigs.get('configs').pushObject(addedProperty);
           addedProperty.validate();


Mime
View raw message