ソースを参照

AMBARI-14174 Add Ranger KMS: Other services are incorrectly reconfigured. (atkach)

Andrii Tkach 9 年 前
コミット
4d13432f14

+ 5 - 0
ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml

@@ -354,4 +354,9 @@
     </description>
   </property>
 
+  <property>
+    <name>tez.tez-ui.history-url.base</name>
+    <description></description>
+  </property>
+
 </configuration>

+ 0 - 1
ambari-web/app/controllers/wizard/step7_controller.js

@@ -721,7 +721,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
     if (this.get('wizardController.name') == 'addServiceController') {
       // for Add Service just remove or add dependent properties and ignore config values changes
       // for installed services only
-      this.addRemoveDependentConfigs(this.get('installedServiceNames'));
       this.clearDependenciesForInstalledServices(this.get('installedServiceNames'), this.get('stepConfigs'));
     }
     // * add dependencies based on recommendations

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

@@ -183,7 +183,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
       return p && p.concat(c);
     });
     var cleanDependencies = this.get('_dependentConfigValues').reject(function(item) {
-      if ('hadoop.proxyuser'.contains(Em.get(item, 'name'))) return false;
+      if (Em.get(item, 'propertyName').contains('hadoop.proxyuser')) return false;
       if (installedServices.contains(Em.get(item, 'serviceName'))) {
         var stackProperty = App.configsCollection.getConfigByName(item.propertyName, item.fileName);
         var parentConfigs = stackProperty && stackProperty.propertyDependsOn;

+ 0 - 14
ambari-web/test/controllers/wizard/step7_test.js

@@ -1260,20 +1260,6 @@ describe('App.InstallerStep7Controller', function () {
     var controller = App.WizardStep7Controller.create({
         installedServiceNames: ['HBASE', 'AMBARI_METRICS']
       }),
-      serviceConfigTags = [
-        {
-          siteName: 'hbase-site',
-          tagName: 'version1'
-        },
-        {
-          siteName: 'ams-hbase-site',
-          tagName: 'version1'
-        },
-        {
-          siteName: 'site-without-properties',
-          tagName: 'version1'
-        }
-      ],
       configs = [
         {
           name: 'hbase.client.scanner.caching',