You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/09/04 16:55:03 UTC
ambari git commit: AMBARI-13016. Accumulo Service Check fails after
moving Namenode (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 890c27a4f -> 6c98f47a5
AMBARI-13016. Accumulo Service Check fails after moving Namenode (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6c98f47a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6c98f47a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6c98f47a
Branch: refs/heads/trunk
Commit: 6c98f47a5b5c887ada8bf0556c96942a5baec9f5
Parents: 890c27a
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Sep 4 17:53:08 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Sep 4 17:54:58 2015 +0300
----------------------------------------------------------------------
.../main/service/reassign/step4_controller.js | 21 +++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6c98f47a/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 1fc8d4e..51de785 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -675,6 +675,13 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
if (!App.get('isHaEnabled') && App.Service.find('ACCUMULO').get('isLoaded')) {
configs['accumulo-site']['instance.volumes'] = configs['accumulo-site']['instance.volumes'].replace(/\/\/[^\/]*/, '//' + targetHostName + ':8020');
}
+ if (App.Service.find('ACCUMULO').get('isLoaded')) {
+ 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']) {
+ configs['accumulo-site']['instance.volumes.replacements'] = source + ' ' + target;
+ }
+ }
},
/**
@@ -688,21 +695,21 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
if (App.get('isRMHaEnabled')) {
if (configs['yarn-site']['yarn.resourcemanager.hostname.rm1'] === sourceHostName) {
configs['yarn-site']['yarn.resourcemanager.hostname.rm1'] = targetHostName;
-
+
var webAddressPort = this.getWebAddressPort(configs, 'yarn.resourcemanager.webapp.address.rm1');
if(webAddressPort != null)
configs['yarn-site']['yarn.resourcemanager.webapp.address.rm1'] = targetHostName +":"+ webAddressPort;
-
+
var httpsWebAddressPort = this.getWebAddressPort(configs, 'yarn.resourcemanager.webapp.https.address.rm1');
if(httpsWebAddressPort != null)
configs['yarn-site']['yarn.resourcemanager.webapp.https.address.rm1'] = targetHostName +":"+ httpsWebAddressPort;
} else {
configs['yarn-site']['yarn.resourcemanager.hostname.rm2'] = targetHostName;
-
+
var webAddressPort = this.getWebAddressPort(configs, 'yarn.resourcemanager.webapp.address.rm2');
if(webAddressPort != null)
configs['yarn-site']['yarn.resourcemanager.webapp.address.rm2'] = targetHostName +":"+ webAddressPort;
-
+
var httpsWebAddressPort = this.getWebAddressPort(configs, 'yarn.resourcemanager.webapp.https.address.rm2');
if(httpsWebAddressPort != null)
configs['yarn-site']['yarn.resourcemanager.webapp.https.address.rm2'] = targetHostName +":"+ httpsWebAddressPort;
@@ -711,7 +718,7 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
},
/**
- * Get the web address port when RM HA is enabled.
+ * Get the web address port when RM HA is enabled.
* @param configs
* @param webAddressKey (http vs https)
* */
@@ -725,13 +732,13 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
result = result.replace(/^\s+|\s+$/g, '');
}
}
-
+
if(result) //only return non-empty result
return result;
else
return null;
},
-
+
/**
* set specific configs which applies only to Hive related configs
* @param configs