Browse Source

AMBARI-13370. Add Service Wizard->service configuration page: Recommended configs of different service are not getting updated. (Andrii Babiichuk via jaimin)

Jaimin Jetly 10 years ago
parent
commit
8967ed9bc8

+ 21 - 21
ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml

@@ -107,7 +107,7 @@
 
 
   <property>
   <property>
     <name>ranger-hdfs-plugin-enabled</name>
     <name>ranger-hdfs-plugin-enabled</name>
-    <value>false</value>
+    <value>No</value>
     <display-name>HDFS Ranger Plugin</display-name>
     <display-name>HDFS Ranger Plugin</display-name>
     <description>Enable HDFS Ranger plugin</description>
     <description>Enable HDFS Ranger plugin</description>
     <value-attributes>
     <value-attributes>
@@ -115,11 +115,11 @@
       <type>value-list</type>
       <type>value-list</type>
       <entries>
       <entries>
         <entry>
         <entry>
-          <value>true</value>
+          <value>Yes</value>
           <label>Enabled</label>
           <label>Enabled</label>
         </entry>
         </entry>
         <entry>
         <entry>
-          <value>false</value>
+          <value>No</value>
           <label>Disabled</label>
           <label>Disabled</label>
         </entry>
         </entry>
       </entries>
       </entries>
@@ -129,7 +129,7 @@
 
 
   <property>
   <property>
     <name>ranger-hive-plugin-enabled</name>
     <name>ranger-hive-plugin-enabled</name>
-    <value>false</value>
+    <value>No</value>
     <display-name>Hive Ranger Plugin</display-name>
     <display-name>Hive Ranger Plugin</display-name>
     <description>Enable Hive Ranger plugin</description>
     <description>Enable Hive Ranger plugin</description>
     <value-attributes>
     <value-attributes>
@@ -137,11 +137,11 @@
       <type>value-list</type>
       <type>value-list</type>
       <entries>
       <entries>
         <entry>
         <entry>
-          <value>true</value>
+          <value>Yes</value>
           <label>Enabled</label>
           <label>Enabled</label>
         </entry>
         </entry>
         <entry>
         <entry>
-          <value>false</value>
+          <value>No</value>
           <label>Disabled</label>
           <label>Disabled</label>
         </entry>
         </entry>
       </entries>
       </entries>
@@ -151,7 +151,7 @@
 
 
   <property>
   <property>
     <name>ranger-hbase-plugin-enabled</name>
     <name>ranger-hbase-plugin-enabled</name>
-    <value>false</value>
+    <value>No</value>
     <display-name>Hbase Ranger Plugin</display-name>
     <display-name>Hbase Ranger Plugin</display-name>
     <description>Enable HBase Ranger plugin</description>
     <description>Enable HBase Ranger plugin</description>
     <value-attributes>
     <value-attributes>
@@ -159,11 +159,11 @@
       <type>value-list</type>
       <type>value-list</type>
       <entries>
       <entries>
         <entry>
         <entry>
-          <value>true</value>
+          <value>Yes</value>
           <label>Enabled</label>
           <label>Enabled</label>
         </entry>
         </entry>
         <entry>
         <entry>
-          <value>false</value>
+          <value>No</value>
           <label>Disabled</label>
           <label>Disabled</label>
         </entry>
         </entry>
       </entries>
       </entries>
@@ -173,7 +173,7 @@
 
 
   <property>
   <property>
     <name>ranger-storm-plugin-enabled</name>
     <name>ranger-storm-plugin-enabled</name>
-    <value>false</value>
+    <value>No</value>
     <display-name>Storm Ranger Plugin</display-name>
     <display-name>Storm Ranger Plugin</display-name>
     <description>Enable Storm Ranger plugin</description>
     <description>Enable Storm Ranger plugin</description>
     <value-attributes>
     <value-attributes>
@@ -181,11 +181,11 @@
       <type>value-list</type>
       <type>value-list</type>
       <entries>
       <entries>
         <entry>
         <entry>
-          <value>true</value>
+          <value>Yes</value>
           <label>Enabled</label>
           <label>Enabled</label>
         </entry>
         </entry>
         <entry>
         <entry>
-          <value>false</value>
+          <value>No</value>
           <label>Disabled</label>
           <label>Disabled</label>
         </entry>
         </entry>
       </entries>
       </entries>
@@ -195,7 +195,7 @@
 
 
   <property>
   <property>
     <name>ranger-kafka-plugin-enabled</name>
     <name>ranger-kafka-plugin-enabled</name>
-    <value>false</value>
+    <value>No</value>
     <display-name>Kafka Ranger Plugin</display-name>
     <display-name>Kafka Ranger Plugin</display-name>
     <description>Enable Kafka Ranger plugin</description>
     <description>Enable Kafka Ranger plugin</description>
     <value-attributes>
     <value-attributes>
@@ -203,11 +203,11 @@
       <type>value-list</type>
       <type>value-list</type>
       <entries>
       <entries>
         <entry>
         <entry>
-          <value>true</value>
+          <value>Yes</value>
           <label>Enabled</label>
           <label>Enabled</label>
         </entry>
         </entry>
         <entry>
         <entry>
-          <value>false</value>
+          <value>No</value>
           <label>Disabled</label>
           <label>Disabled</label>
         </entry>
         </entry>
       </entries>
       </entries>
@@ -217,7 +217,7 @@
 
 
   <property>
   <property>
     <name>ranger-knox-plugin-enabled</name>
     <name>ranger-knox-plugin-enabled</name>
-    <value>false</value>
+    <value>No</value>
     <display-name>Knox Ranger Plugin</display-name>
     <display-name>Knox Ranger Plugin</display-name>
     <description>Enable Knox Ranger plugin</description>
     <description>Enable Knox Ranger plugin</description>
     <value-attributes>
     <value-attributes>
@@ -225,11 +225,11 @@
       <type>value-list</type>
       <type>value-list</type>
       <entries>
       <entries>
         <entry>
         <entry>
-          <value>true</value>
+          <value>Yes</value>
           <label>Enabled</label>
           <label>Enabled</label>
         </entry>
         </entry>
         <entry>
         <entry>
-          <value>false</value>
+          <value>No</value>
           <label>Disabled</label>
           <label>Disabled</label>
         </entry>
         </entry>
       </entries>
       </entries>
@@ -239,7 +239,7 @@
 
 
   <property>
   <property>
     <name>ranger-yarn-plugin-enabled</name>
     <name>ranger-yarn-plugin-enabled</name>
-    <value>false</value>
+    <value>No</value>
     <display-name>YARN Ranger Plugin</display-name>
     <display-name>YARN Ranger Plugin</display-name>
     <description>Enable YARN Ranger plugin</description>
     <description>Enable YARN Ranger plugin</description>
     <value-attributes>
     <value-attributes>
@@ -247,11 +247,11 @@
       <type>value-list</type>
       <type>value-list</type>
       <entries>
       <entries>
         <entry>
         <entry>
-          <value>true</value>
+          <value>Yes</value>
           <label>Enabled</label>
           <label>Enabled</label>
         </entry>
         </entry>
         <entry>
         <entry>
-          <value>false</value>
+          <value>No</value>
           <label>Disabled</label>
           <label>Disabled</label>
         </entry>
         </entry>
       </entries>
       </entries>

+ 2 - 2
ambari-web/app/mixins/common/configs/enhanced_configs.js

@@ -435,7 +435,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
       this.set('_fileNamesToUpdate', fileNamesToUpdate);
       this.set('_fileNamesToUpdate', fileNamesToUpdate);
     }
     }
     var notDefaultGroup = !!selectedConfigGroup;
     var notDefaultGroup = !!selectedConfigGroup;
-    var parentPropertiesNames = parentConfigs ? parentConfigs.mapProperty('name') : [];
+    var parentPropertiesNames = parentConfigs ? parentConfigs.map(function(p) { return App.config.configId(Em.get(p, 'name'), Em.get(p, 'type'))}) : [];
     /** get all configs by config group **/
     /** get all configs by config group **/
     for (var key in configObject) {
     for (var key in configObject) {
 
 
@@ -472,7 +472,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
           initialValue = validator.isValidFloat(initialValue) ? parseFloat(initialValue).toString() : initialValue;
           initialValue = validator.isValidFloat(initialValue) ? parseFloat(initialValue).toString() : initialValue;
           recommendedValue = validator.isValidFloat(recommendedValue) ? parseFloat(recommendedValue).toString() : recommendedValue;
           recommendedValue = validator.isValidFloat(recommendedValue) ? parseFloat(recommendedValue).toString() : recommendedValue;
 
 
-          if (!updateOnlyBoundaries && !parentPropertiesNames.contains(propertyName) && initialValue != recommendedValue) { //on first initial request we don't need to change values
+          if (!updateOnlyBoundaries && !parentPropertiesNames.contains(App.config.configId(propertyName, key)) && initialValue != recommendedValue) { //on first initial request we don't need to change values
             if (dependentProperty) {
             if (dependentProperty) {
               Em.set(dependentProperty, 'value', initialValue);
               Em.set(dependentProperty, 'value', initialValue);
               Em.set(dependentProperty, 'recommendedValue', recommendedValue);
               Em.set(dependentProperty, 'recommendedValue', recommendedValue);