Repository: ambari Updated Branches: refs/heads/trunk 2e3a29ef5 -> a30c6a13b
AMBARI-15126 - Move NameNode wizard in HA environment fails to update configs correctly when namenode is not running on default port (rzang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a30c6a13 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a30c6a13 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a30c6a13 Branch: refs/heads/trunk Commit: a30c6a13b2217cc773e29fc8161ef8a616e944ef Parents: 2e3a29e Author: Richard Zang <rz...@apache.org> Authored: Wed Nov 9 18:10:18 2016 -0800 Committer: Richard Zang <rz...@apache.org> Committed: Wed Nov 9 18:10:18 2016 -0800 ---------------------------------------------------------------------- .../app/controllers/main/service/reassign/step4_controller.js | 2 +- .../app/views/common/configs/service_configs_by_category_view.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a30c6a13/ambari-web/app/controllers/main/service/reassign/step4_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/reassign/step4_controller.js b/ambari-web/app/controllers/main/service/reassign/step4_controller.js index 243fa3b..26ac68c 100644 --- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js +++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js @@ -675,7 +675,7 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro var ret = {}; if (App.get('isHaEnabled')) { ret.namespaceId = configs['hdfs-site']['dfs.nameservices']; - ret.suffix = (configs['hdfs-site']['dfs.namenode.http-address.' + ret.namespaceId + '.nn1'] === this.get('content.reassignHosts.source') + ':50070') ? 'nn1' : 'nn2'; + ret.suffix = (configs['hdfs-site']['dfs.namenode.http-address.' + ret.namespaceId + '.nn1'].indexOf(this.get('content.reassignHosts.source')) != -1) ? 'nn1' : 'nn2'; } return ret; }, http://git-wip-us.apache.org/repos/asf/ambari/blob/a30c6a13/ambari-web/app/views/common/configs/service_configs_by_category_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js index ac59386..f78bb5f 100644 --- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js +++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js @@ -329,7 +329,8 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri collapseCategory: function () { if (this.get('state') === 'destroyed') return; $('.popover').remove(); - var filter = this.get('mainView.filter').toLowerCase(); + var filter = this.get('mainView.filter'); + filter = filter? filter.toLowerCase() : filter; // filter can be undefined in some wizard var filteredResult = this.get('categoryConfigs'); var isInitialRendering = !arguments.length || arguments[1] != 'categoryConfigs';
