Updated Branches:
  refs/heads/trunk 7107d5e26 -> 6e9cd1bd0

AMBARI-3735. Reassign Master: moving the NameNode while NameNode HA is enabled 
breaks HBase. (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/6e9cd1bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/6e9cd1bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/6e9cd1bd

Branch: refs/heads/trunk
Commit: 6e9cd1bd002c8b83309e45dddb7db3bc21354323
Parents: 7107d5e
Author: Oleg Nechiporenko <cv_git...@yahoo.com>
Authored: Mon Nov 11 15:31:40 2013 +0200
Committer: Oleg Nechiporenko <cv_git...@yahoo.com>
Committed: Mon Nov 11 15:34:52 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6e9cd1bd/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 3af54e2..078b493 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -214,9 +214,11 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
             var nameServices = configs['hdfs-site']['dfs.nameservices'];
             if (configs['hdfs-site']['dfs.namenode.http-address.' + 
nameServices + '.nn1'] === sourceHostName + ':50070') {
               configs['hdfs-site']['dfs.namenode.http-address.' + nameServices 
+ '.nn1'] = targetHostName + ':50070';
+              configs['hdfs-site']['dfs.namenode.https-address.' + 
nameServices + '.nn1'] = targetHostName + ':50470';
               configs['hdfs-site']['dfs.namenode.rpc-address.' + nameServices 
+ '.nn1'] = targetHostName + ':8020';
             } else {
               configs['hdfs-site']['dfs.namenode.http-address.' + nameServices 
+ '.nn2'] = targetHostName + ':50070';
+              configs['hdfs-site']['dfs.namenode.https-address.' + 
nameServices + '.nn2'] = targetHostName + ':50470';
               configs['hdfs-site']['dfs.namenode.rpc-address.' + nameServices 
+ '.nn2'] = targetHostName + ':8020';
             }
           } else {
@@ -231,8 +233,10 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
           configs['hdfs-site']['dfs.https.address'] = targetHostName + 
':50470';
           configs['core-site']['fs.default.name'] = 'hdfs://' + targetHostName 
+ ':8020';
         }
-        if (App.Service.find().someProperty('serviceName', 'HBASE')) {
-          configs['hbase-site']['hbase.rootdir'] = 
configs['hbase-site']['hbase.rootdir'].replace(/\/\/[^\/]*/, '//' + 
targetHostName);
+        if (App.HostComponent.find().someProperty('componentName', 
'SECONDARY_NAMENODE')) {
+          if (App.Service.find().someProperty('serviceName', 'HBASE')) {
+            configs['hbase-site']['hbase.rootdir'] = 
configs['hbase-site']['hbase.rootdir'].replace(/\/\/[^\/]*/, '//' + 
targetHostName);
+          }
         }
         if (securityEnabled) {
           secureConfigs.push({keytab: 
configs['hdfs-site']['dfs.namenode.keytab.file'], principal: 
configs['hdfs-site']['dfs.namenode.kerberos.principal']});

Reply via email to