Updated Branches: refs/heads/trunk 70b6e8a6e -> 05793888d
AMBARI-3519 Reassign Master: NameNode HA reassignment should not reconfigure fs.defaultFS and hbase.rootdir. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/05793888 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/05793888 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/05793888 Branch: refs/heads/trunk Commit: 05793888d7faf27262bcc05f8821f405ca10cce0 Parents: 70b6e8a Author: Aleksandr Kovalenko <[email protected]> Authored: Tue Oct 15 18:19:39 2013 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Tue Oct 15 18:19:39 2013 +0300 ---------------------------------------------------------------------- .../controllers/main/service/reassign/step4_controller.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/05793888/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 30d4627..d5f1afa 100644 --- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js +++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js @@ -199,10 +199,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro switch (componentName) { case 'NAMENODE': if (isHadoop2Stack) { - componentDir = configs['hdfs-site']['dfs.namenode.name.dir']; - configs['hdfs-site']['dfs.namenode.http-address'] = targetHostName + ':50070'; - configs['hdfs-site']['dfs.namenode.https-address'] = targetHostName + ':50470'; - configs['core-site']['fs.defaultFS'] = 'hdfs://' + targetHostName + ':8020'; if (!App.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE')) { var nameServices = configs['hdfs-site']['dfs.nameservices']; if (configs['hdfs-site']['dfs.namenode.http-address.' + nameServices + '.nn1'] === sourceHostName + ':50070') { @@ -212,7 +208,12 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro configs['hdfs-site']['dfs.namenode.http-address.' + nameServices + '.nn2'] = targetHostName + ':50070'; configs['hdfs-site']['dfs.namenode.rpc-address.' + nameServices + '.nn2'] = targetHostName + ':8020'; } + } else { + configs['hdfs-site']['dfs.namenode.http-address'] = targetHostName + ':50070'; + configs['hdfs-site']['dfs.namenode.https-address'] = targetHostName + ':50470'; + configs['core-site']['fs.defaultFS'] = 'hdfs://' + targetHostName + ':8020'; } + componentDir = configs['hdfs-site']['dfs.namenode.name.dir']; } else { componentDir = configs['hdfs-site']['dfs.name.dir']; configs['hdfs-site']['dfs.http.address'] = targetHostName + ':50070';
