AMBARI-7276 Property: dfs.namenode.http-address has final flag - 'true' in downloaded hdfs-site.xml in HA cluster. (ababiichuk)

ambari-web/app/assets/test/tests.js

@@ -46,6 +46,7 @@ var files = ['test/init_model_test',
   'test/controllers/main/admin/repositories_test',
   'test/controllers/main/admin/serviceAccounts_controller_test',
   'test/controllers/main/admin/highAvailability_controller_test',
+  'test/controllers/main/admin/highAvailability/progress_controller_test',
   'test/controllers/main/admin/security_test',
   'test/controllers/main/admin/security/disable_test',
   'test/controllers/main/admin/security/security_progress_controller_test',

ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js

@@ -412,8 +412,8 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle
    *
    * @param siteNames Array
    */
-  reconfigureSites: function(siteNames,data) {
-    var tagName =  'version' + (new Date).getTime();
+  reconfigureSites: function(siteNames, data) {
+    var tagName = App.get('testMode') ? 'version1' : 'version' + (new Date).getTime();
     var componentName;
     switch (this.get('content.controllerName')) {
       case 'rMHighAvailabilityWizardController':
@@ -422,13 +422,18 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle
       default:
         componentName =  'NAMENODE';
     }
-    return siteNames.map(function(_siteName){
-      return {
+    return siteNames.map(function(_siteName) {
+      var config = data.items.findProperty('type', _siteName);
+      var configToSave = {
         type: _siteName,
         tag: tagName,
-        properties: data.items.findProperty('type', _siteName).properties,
+        properties: config && config.properties,
         service_config_version_note: Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role(componentName))
       }
+      if (config && config.properties_attributes) {
+        configToSave.properties_attributes = config.properties_attributes;
+      }
+      return configToSave;
     });
   }
 });

ambari-web/app/utils/config.js

@@ -591,14 +591,16 @@ App.config = Em.Object.create({
   addAdvancedConfigs: function (serviceConfigs, advancedConfigs, serviceName) {
     var miscConfigs = serviceConfigs.filterProperty('serviceName', 'MISC');
     var configsToVerifying = (serviceName) ? serviceConfigs.filterProperty('serviceName', serviceName).concat(miscConfigs) : serviceConfigs.slice();
-    var definedConfigs = (serviceName) ? this.get('preDefinedServiceConfigs').findProperty('serviceName', serviceName).get('configs') : [];
+    var definedService = this.get('preDefinedServiceConfigs').findProperty('serviceName', serviceName);
+    if (definedService) {
+      var definedConfigs = (serviceName) ? definedService.get('configs') : [];
 
-    if (definedConfigs.length) {
-      advancedConfigs = advancedConfigs.filter(function(property) {
-        return !(definedConfigs.someProperty('name', property.name) && !serviceConfigs.someProperty('name', property.name));
-      }, this);
+      if (definedConfigs.length) {
+        advancedConfigs = advancedConfigs.filter(function(property) {
+          return !(definedConfigs.someProperty('name', property.name) && !serviceConfigs.someProperty('name', property.name));
+        }, this);
+      }
     }
-
     advancedConfigs.forEach(function (_config) {
       var configType = this.getConfigTagFromFileName(_config.filename);
       var configCategory = 'Advanced ' + configType;

ambari-web/test/controllers/main/admin/highAvailability/progress_controller_test.js

@@ -0,0 +1,144 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+var App = require('app');
+require('controllers/main/admin/highAvailability_controller');
+require('models/host_component');
+require('models/host');
+require('utils/ajax/ajax');
+
+describe('App.HighAvailabilityProgressPageController', function () {
+
+  var controller = App.HighAvailabilityProgressPageController.create();
+
+  describe('#reconfigureSites()', function () {
+    var tests = [
+      {
+        content: {
+          controllerName: "rMHighAvailabilityWizardController"
+        },
+        siteNames: ["site1", "site2"],
+        data: {
+          items: [
+            {
+              type: "site1",
+              properties: {
+                site1_property1: "site1_property1_value",
+                site1_property2: "site1_property2_value"
+              },
+              properties_attributes: {
+                final: {
+                  site1_property1: "true"
+                }
+              }
+            },
+            {
+              type: "site2",
+              properties: {
+                site2_property1: "site2_property1_value",
+                site2_property2: "site2_property2_value"
+              }
+            },
+            {
+              type: "site3",
+              properties: {
+                site3_property: "site3_property_value"
+              }
+            }
+          ]
+        },
+        result: [
+          {
+            type: "site1",
+            tag: "version1",
+            properties: {
+              site1_property1: "site1_property1_value",
+              site1_property2: "site1_property2_value"
+            },
+            service_config_version_note: Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format("ResourceManager"),
+            properties_attributes: {
+              final: {
+                site1_property1: "true"
+              }
+            }
+          },
+          {
+            type: "site2",
+            tag: "version1",
+            properties: {
+              site2_property1: "site2_property1_value",
+              site2_property2: "site2_property2_value"
+            },
+            service_config_version_note: Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format("ResourceManager")
+          }
+        ]
+      },
+      {
+        content: {
+          controllerName: "anyOther"
+        },
+        siteNames: ["site1"],
+        data: {
+          items: [
+            {
+              type: "site1",
+              properties: {
+                site1_property1: "site1_property1_value",
+                site1_property2: "site1_property2_value"
+              },
+              properties_attributes: {
+                final: {
+                  site1_property1: "true"
+                }
+              }
+            }
+          ]
+        },
+        result: [
+          {
+            type: "site1",
+            tag: "version1",
+            properties: {
+              site1_property1: "site1_property1_value",
+              site1_property2: "site1_property2_value"
+            },
+            service_config_version_note: Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format("NameNode"),
+            properties_attributes: {
+              final: {
+                site1_property1: "true"
+              }
+            }
+          }
+        ]
+      }];
+    beforeEach(function() {
+      App.set('testMode', true);
+    });
+    afterEach(function() {
+      App.set('testMode', false);
+    });
+    it("reconfigures configs after HA", function() {
+      tests.forEach(function(t) {
+        controller.set('content', t.content);
+        expect(controller.reconfigureSites(t.siteNames, t.data)).to.eql(t.result);
+      });
+    });
+  });
+
+});