[ambari] branch branch-2.6 updated: AMBARI-25461. Move JournalNode wizard generates wrong dfs.namenode.shared.edits.dir

[alexantonenko]

This is an automated email from the ASF dual-hosted git repository.

alexantonenko pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new 19ba044  AMBARI-25461. Move JournalNode wizard generates wrong 
dfs.namenode.shared.edits.dir
     new 980605c  Merge pull request #3171 from hiveww/AMBARI-25461-branch2.6
19ba044 is described below

commit 19ba0444e646dffe9d747e05b525279fcdbb5f35
Author: Alex Antonenko <aantone...@hortonworks.com>
AuthorDate: Tue Jan 21 17:40:57 2020 +0200

    AMBARI-25461. Move JournalNode wizard generates wrong 
dfs.namenode.shared.edits.dir
---
 .../main/admin/highAvailability/journalNode/step2_controller.js        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
index 9804428..99c9770 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step2_controller.js
@@ -80,7 +80,8 @@ App.ManageJournalNodeWizardStep2Controller = 
Em.Controller.extend({
 
   onLoadConfigs: function (data) {
     this.set('serverConfigData',data);
-    this.set('content.nameServiceId', 
data.items[0].properties['dfs.nameservices']);
+    this.set('content.nameServiceId',
+              data.items[0].properties['dfs.internal.nameservices'] || 
data.items[0].properties['dfs.nameservices'].split(',')[0]);
     this.tweakServiceConfigs(this.get('moveJNConfig.configs'));
     this.renderServiceConfigs(this.get('moveJNConfig'));
     this.set('isLoaded', true);