You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/11/18 01:12:34 UTC
ambari git commit: AMBARI-8360. Moving namenode fails if NameNode HA
is enabled on HDP-2.2. (Oleg via jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 4f731cf1b -> df306cfc7
AMBARI-8360. Moving namenode fails if NameNode HA is enabled on HDP-2.2. (Oleg via jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df306cfc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df306cfc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df306cfc
Branch: refs/heads/branch-1.7.0
Commit: df306cfc752d746377f81a30311acfc5ff577683
Parents: 4f731cf
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Mon Nov 17 16:11:49 2014 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Mon Nov 17 16:11:49 2014 -0800
----------------------------------------------------------------------
.../controllers/main/service/reassign/step4_controller.js | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/df306cfc/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 6d91432..3a547a3 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -176,8 +176,14 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
var additionalConfigs = (component.configs_Hadoop2 && isHadoop2Stack) ? component.configs_Hadoop2 : component.configs;
for (var site in additionalConfigs) {
- for (var property in additionalConfigs[site]) {
- configs[site][property] = additionalConfigs[site][property].replace('<replace-value>', replaceValue);
+ if (additionalConfigs.hasOwnProperty(site)) {
+ for (var property in additionalConfigs[site]) {
+ if (additionalConfigs[site].hasOwnProperty(property)) {
+ if (App.get('isHaEnabled') && componentName === 'NAMENODE' && property === 'fs.defaultFS') continue;
+
+ configs[site][property] = additionalConfigs[site][property].replace('<replace-value>', replaceValue);
+ }
+ }
}
}
return true;