incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject git commit: AMBARI-3500. Reassign Master Wizard: move SNameNode in 2.x stack (non-secure). (akovalenko)
Date Fri, 11 Oct 2013 14:33:36 GMT
Updated Branches:
  refs/heads/trunk 36cdefe00 -> 82823e6e2


AMBARI-3500. Reassign Master Wizard: move  SNameNode in 2.x stack (non-secure). (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/82823e6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/82823e6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/82823e6e

Branch: refs/heads/trunk
Commit: 82823e6e20ed1d50545e0072e11f5cc32a6b1dc6
Parents: 36cdefe
Author: Aleksandr Kovalenko <oleksandr.kovalenko@ukr.net>
Authored: Fri Oct 11 17:31:33 2013 +0300
Committer: Aleksandr Kovalenko <oleksandr.kovalenko@ukr.net>
Committed: Fri Oct 11 17:31:33 2013 +0300

----------------------------------------------------------------------
 .../controllers/main/service/reassign/step4_controller.js   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/82823e6e/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 4fa4e75..3b8449a 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -239,8 +239,13 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
         }
         break;
       case 'SECONDARY_NAMENODE':
-        componentDir = configs['core-site']['fs.checkpoint.dir'];
-        configs['hdfs-site']['dfs.secondary.http.address'] = targetHostName + ':50090';
+        if (isHadoop2Stack) {
+          componentDir = configs['hdfs-site']['dfs.namenode.checkpoint.dir'];
+          configs['hdfs-site']['dfs.namenode.secondary.http-address'] = targetHostName +
':50090';
+        } else {
+          componentDir = configs['core-site']['fs.checkpoint.dir'];
+          configs['hdfs-site']['dfs.secondary.http.address'] = targetHostName + ':50090';
+        }
         break;
       case 'JOBTRACKER':
         componentDir = configs['mapred-site']['mapred.local.dir'];


Mime
View raw message