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/01 16:22:36 UTC
git commit: AMBARI-3399. Reassign Master Wizard: move JobTracker in
1.x stack (non-secure). (akovalenko)
Updated Branches:
refs/heads/trunk a07468767 -> f01523b6a
AMBARI-3399. Reassign Master Wizard: move JobTracker in 1.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/f01523b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/f01523b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/f01523b6
Branch: refs/heads/trunk
Commit: f01523b6a790ceb8332bac397d08cfacf58fbb74
Parents: a074687
Author: Aleksandr Kovalenko <ol...@ukr.net>
Authored: Tue Oct 1 17:22:19 2013 +0300
Committer: Aleksandr Kovalenko <ol...@ukr.net>
Committed: Tue Oct 1 17:22:19 2013 +0300
----------------------------------------------------------------------
.../main/service/reassign_controller.js | 2 +-
.../app/controllers/wizard/step13_controller.js | 12 +++++++-
ambari-web/app/messages.js | 6 ++++
ambari-web/app/views/main/service/item.js | 31 +++-----------------
4 files changed, 22 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f01523b6/ambari-web/app/controllers/main/service/reassign_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign_controller.js b/ambari-web/app/controllers/main/service/reassign_controller.js
index 367bc9e..90be313 100644
--- a/ambari-web/app/controllers/main/service/reassign_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign_controller.js
@@ -55,7 +55,7 @@ App.ReassignMasterController = App.WizardController.extend({
hasManualSteps: false
}),
- componentsWithManualSteps: ['NAMENODE', 'SECONDARY_NAMENODE'],
+ componentsWithManualSteps: ['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER'],
addManualSteps: function () {
this.set('content.hasManualSteps', this.get('componentsWithManualSteps').contains(this.get('content.reassign.component_name')));
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f01523b6/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 9901042..2ad637e 100644
--- a/ambari-web/app/controllers/wizard/step13_controller.js
+++ b/ambari-web/app/controllers/wizard/step13_controller.js
@@ -169,6 +169,10 @@ App.WizardStep13Controller = App.HighAvailabilityProgressPageController.extend({
break;
case 'SECONDARY_NAMENODE':
urlParams.push('(type=hdfs-site&tag=' + data.Clusters.desired_configs['hdfs-site'].tag + ')');
+ urlParams.push('(type=core-site&tag=' + data.Clusters.desired_configs['core-site'].tag + ')');
+ break;
+ case 'JOBTRACKER':
+ urlParams.push('(type=mapred-site&tag=' + data.Clusters.desired_configs['mapred-site'].tag + ')');
break;
}
App.ajax.send({
@@ -208,9 +212,15 @@ App.WizardStep13Controller = App.HighAvailabilityProgressPageController.extend({
}
break;
case 'SECONDARY_NAMENODE':
- componentDir = configs['hdfs-site']['fs.checkpoint.dir'];
+ componentDir = configs['core-site']['fs.checkpoint.dir'];
configs['hdfs-site']['dfs.secondary.http.address'] = targetHostName + ':50090';
break;
+ case 'JOBTRACKER':
+ componentDir = configs['mapred-site']['mapred.local.dir'];
+ configs['mapred-site']['mapreduce.history.server.http.address'] = targetHostName + ':51111';
+ configs['mapred-site']['mapred.job.tracker.http.address'] = targetHostName + ':50030';
+ configs['mapred-site']['mapred.job.tracker'] = targetHostName + ':50300';
+ break;
}
App.router.get(this.get('content.controllerName')).saveComponentDir(componentDir);
App.clusterStatus.setClusterStatus({
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f01523b6/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 0bafee1..cb95e0e 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -583,6 +583,12 @@ Em.I18n.translations = {
'<div class="code-snippet">chown -R hdfs:hadoop /hadoop/hdfs/namesecondary/</div></li>' +
'<li>Proceed next' +
'</ol>',
+ 'installer.step14.body.jobtracker': '<ol>' +
+ '<li>Copy contents of <b>{0}</b> from source host <b>{1}</b> to the target host <b>{2}</b> same locations</li>' +
+ '<li>Login to the target host <b>{2}</b> and change permissions for the JobTracker dirs by running:' +
+ '<div class="code-snippet">chown -R mapred:hadoop /hadoop/mapred/</div></li>' +
+ '<li>Proceed next' +
+ '</ol>',
'installer.step15.header': 'Install, Start and Test',
'installer.step15.task0.title':'{0} remove',
'installer.step15.task1.title':'{1} start',
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f01523b6/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 d135dad..d93b50f 100644
--- a/ambari-web/app/views/main/service/item.js
+++ b/ambari-web/app/views/main/service/item.js
@@ -37,38 +37,15 @@ App.MainServiceItemView = Em.View.extend({
// break;
case 'GANGLIA':
case 'NAGIOS':
-/* if (App.supports.reassignMaster) {
+ break;
+ case 'MAPREDUCE':
+ if (App.supports.reassignMaster) {
this.get('controller.content.hostComponents').filterProperty('isMaster').forEach (function (hostComponent){
options.push({action: 'reassignMaster', context: hostComponent, 'label': Em.I18n.t('services.service.actions.reassign.master').format(hostComponent.get('displayName'))});
})
- }*/
- break;
- case 'HIVE':
- options.push({action: 'runSmokeTest', 'label': Em.I18n.t('services.service.actions.run.smoke')});
-/* if (App.supports.reassignMaster) {
- options.push({action: 'reassignMaster', context: App.HostComponent.find().findProperty('componentName', 'HIVE_METASTORE'), 'label': Em.I18n.t('services.service.actions.reassign.master').format(App.HostComponent.find().findProperty('componentName', 'HIVE_METASTORE').get('displayName'))});
- options.push({action: 'reassignMaster', context: App.HostComponent.find().findProperty('componentName', 'HIVE_SERVER'), 'label': Em.I18n.t('services.service.actions.reassign.master.hive')});
- }*/
- break;
- case 'WEBHCAT':
- options.push({action: 'runSmokeTest', 'label': Em.I18n.t('services.service.actions.run.smoke')});
-/* if (App.supports.reassignMaster) {
- options.push({action: 'reassignMaster', context: App.HostComponent.find().findProperty('componentName', 'HIVE_SERVER'), 'label': Em.I18n.t('services.service.actions.reassign.master.hive')});
- }*/
- break;
- case 'HUE':
- options.push({action: 'runSmokeTest', 'label': Em.I18n.t('services.service.actions.run.smoke')});
- break;
- case 'FLUME':
- break;
+ }
default:
- var components = this.get('controller.content.hostComponents');
options.push({action: 'runSmokeTest', 'label': Em.I18n.t('services.service.actions.run.smoke')});
-/* if (App.supports.reassignMaster) {
- components.filterProperty('isMaster').mapProperty('displayName').uniq().forEach (function (hostComponent){
- options.push({action: 'reassignMaster', context: components.findProperty('displayName', hostComponent), 'label': Em.I18n.t('services.service.actions.reassign.master').format(hostComponent)});
- })
- }*/
}
return options;
}.property('controller.content'),