You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2013/10/03 17:13:54 UTC
git commit: AMBARI-3447. Reassign Master Wizard: move ResourceManager
in 2.x stack (non-secure). (akovalenko)
Updated Branches:
refs/heads/trunk acd08ba9b -> 948a41fc5
AMBARI-3447. Reassign Master Wizard: move ResourceManager 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/948a41fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/948a41fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/948a41fc
Branch: refs/heads/trunk
Commit: 948a41fc597b41d27c0e02fb75f12f5c7960c1e9
Parents: acd08ba
Author: Aleksandr Kovalenko <ol...@ukr.net>
Authored: Thu Oct 3 18:12:34 2013 +0300
Committer: Aleksandr Kovalenko <ol...@ukr.net>
Committed: Thu Oct 3 18:12:34 2013 +0300
----------------------------------------------------------------------
.../app/controllers/wizard/step13_controller.js | 27 +++++++++++++++-----
ambari-web/app/messages.js | 4 +--
ambari-web/app/views/main/service/item.js | 1 +
ambari-web/app/views/wizard/step13_view.js | 4 +--
4 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/948a41fc/ambari-web/app/controllers/wizard/step13_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step13_controller.js b/ambari-web/app/controllers/wizard/step13_controller.js
index e622985..524d359 100644
--- a/ambari-web/app/controllers/wizard/step13_controller.js
+++ b/ambari-web/app/controllers/wizard/step13_controller.js
@@ -174,6 +174,9 @@ App.WizardStep13Controller = App.HighAvailabilityProgressPageController.extend({
case 'JOBTRACKER':
urlParams.push('(type=mapred-site&tag=' + data.Clusters.desired_configs['mapred-site'].tag + ')');
break;
+ case 'RESOURCEMANAGER':
+ urlParams.push('(type=yarn-site&tag=' + data.Clusters.desired_configs['yarn-site'].tag + ')');
+ break;
}
App.ajax.send({
name: 'reassign.load_configs',
@@ -228,14 +231,24 @@ App.WizardStep13Controller = App.HighAvailabilityProgressPageController.extend({
configs['mapred-site']['mapred.job.tracker.http.address'] = targetHostName + ':50030';
configs['mapred-site']['mapred.job.tracker'] = targetHostName + ':50300';
break;
+ case 'RESOURCEMANAGER':
+ configs['yarn-site']['yarn.resourcemanager.address'] = targetHostName + ':8050';
+ configs['yarn-site']['yarn.resourcemanager.admin.address'] = targetHostName + ':8141';
+ configs['yarn-site']['yarn.resourcemanager.resource-tracker.address'] = targetHostName + ':8025';
+ configs['yarn-site']['yarn.resourcemanager.scheduler.address'] = targetHostName + ':8030';
+ configs['yarn-site']['yarn.resourcemanager.webapp.address'] = targetHostName + ':8088';
+ configs['yarn-site']['yarn.resourcemanager.hostname'] = targetHostName;
+ break;
+ }
+ if (componentDir) {
+ App.router.get(this.get('content.controllerName')).saveComponentDir(componentDir);
+ App.clusterStatus.setClusterStatus({
+ clusterName: this.get('content.cluster.name'),
+ clusterState: this.get('clusterDeployState'),
+ wizardControllerName: this.get('content.controllerName'),
+ localdb: App.db.data
+ });
}
- App.router.get(this.get('content.controllerName')).saveComponentDir(componentDir);
- App.clusterStatus.setClusterStatus({
- clusterName: this.get('content.cluster.name'),
- clusterState: this.get('clusterDeployState'),
- wizardControllerName: this.get('content.controllerName'),
- localdb: App.db.data
- });
for (var site in configs) {
if (!configs.hasOwnProperty(site)) continue;
App.ajax.send({
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/948a41fc/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index c9ef878..f26859c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -560,8 +560,8 @@ Em.I18n.translations = {
'installer.step13.task2.title':'{0} disable',
'installer.step13.task3.title':'{1} reconfigure',
'installer.step13.task4.title':'{0} install',
- 'installer.step13.task5.title':'{1} start',
- 'installer.step13.task6.title':'{0} remove',
+ 'installer.step13.task5.title':'{1} remove',
+ 'installer.step13.task6.title':'{0} start',
'installer.step13.status.success': 'Successfully reassigned {0}',
'installer.step13.status.success.withManualSteps': 'Proceed to the next step',
'installer.step13.status.failed': 'Failed to reassign {0}',
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/948a41fc/ambari-web/app/views/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/item.js b/ambari-web/app/views/main/service/item.js
index 70483d9..b20926b 100644
--- a/ambari-web/app/views/main/service/item.js
+++ b/ambari-web/app/views/main/service/item.js
@@ -27,6 +27,7 @@ App.MainServiceItemView = Em.View.extend({
case 'GANGLIA':
case 'NAGIOS':
break;
+ case 'YARN':
case 'HDFS':
case 'MAPREDUCE':
if (App.supports.reassignMaster) {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/948a41fc/ambari-web/app/views/wizard/step13_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step13_view.js b/ambari-web/app/views/wizard/step13_view.js
index be17684..c6ef8cf 100644
--- a/ambari-web/app/views/wizard/step13_view.js
+++ b/ambari-web/app/views/wizard/step13_view.js
@@ -33,9 +33,9 @@ App.WizardStep13View = App.HighAvailabilityProgressPageView.extend({
noticeCompleted: function () {
if (this.get('controller.content.hasManualSteps')) {
- return Em.I18n.t('installer.step13.status.success.withManualSteps').format(this.get('controller.content.reassign.component_name'));
+ return Em.I18n.t('installer.step13.status.success.withManualSteps').format(App.format.role(this.get('controller.content.reassign.component_name')));
} else {
- return Em.I18n.t('installer.step13.status.success').format(this.get('controller.content.reassign.component_name'));
+ return Em.I18n.t('installer.step13.status.success').format(App.format.role(this.get('controller.content.reassign.component_name')));
}
}.property('controller.content.reassign.component_name'),