You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2015/10/24 23:56:43 UTC
ambari git commit: AMBARI-13494. Ambari generate invalid
configuration after namenode move with HA enabled (Josh Elser via rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk 42bd7e468 -> 0a1bb1136
AMBARI-13494. Ambari generate invalid configuration after namenode move with HA enabled (Josh Elser via rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a1bb113
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a1bb113
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a1bb113
Branch: refs/heads/trunk
Commit: 0a1bb1136f1dcfb5ff948e90663036f651a71d86
Parents: 42bd7e4
Author: Richard Zang <rz...@apache.org>
Authored: Sat Oct 24 14:55:22 2015 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Sat Oct 24 14:55:22 2015 -0700
----------------------------------------------------------------------
.../app/controllers/main/service/reassign/step4_controller.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a1bb113/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 148e922..3f7142e 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -679,9 +679,9 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
configs['hbase-site']['hbase.rootdir'] = configs['hbase-site']['hbase.rootdir'].replace(/\/\/[^\/]*/, '//' + targetHostName + ':8020');
}
if (!App.get('isHaEnabled') && App.Service.find('ACCUMULO').get('isLoaded')) {
+ // Update the Namenode's hostname in instance.volumes
configs['accumulo-site']['instance.volumes'] = configs['accumulo-site']['instance.volumes'].replace(/\/\/[^\/]*/, '//' + targetHostName + ':8020');
- }
- if (App.Service.find('ACCUMULO').get('isLoaded')) {
+ // Add a replacement entry from the old hostname to the new hostname
var target = 'hdfs://' + this.get('content.reassignHosts.target') + ':8020' + '/apps/accumulo/data';
var source = 'hdfs://' + this.get('content.reassignHosts.source') + ':8020' + '/apps/accumulo/data';
if (configs['accumulo-site']) {