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/07/12 01:29:15 UTC
git commit: AMBARI-6470. Move NameNode wizard in HA cluster: NameNode
fails to start on "Configure Components" page.(jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-1.6.1 ffb702b25 -> aa313d304
AMBARI-6470. Move NameNode wizard in HA cluster: NameNode fails to start on "Configure Components" page.(jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aa313d30
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aa313d30
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aa313d30
Branch: refs/heads/branch-1.6.1
Commit: aa313d304e98c30f0a5f933872b26ef974307b1d
Parents: ffb702b
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Jul 11 16:28:33 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Jul 11 16:28:33 2014 -0700
----------------------------------------------------------------------
.../app/controllers/main/service/reassign/step4_controller.js | 2 +-
ambari-web/app/views/main/service/reassign/step5_view.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/aa313d30/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 8c29fe4..c8a5a12 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -329,7 +329,7 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
},
startNameNode: function () {
- var hostName = this.get('content.masterComponentHosts').filterProperty('component', 'NAMENODE').mapProperty('hostName').without(this.get('content.reassignHosts.target'));
+ var hostName = this.get('content.masterComponentHosts').filterProperty('component', 'NAMENODE').mapProperty('hostName').without(this.get('content.reassignHosts.source'));
this.startComponent('NAMENODE', hostName);
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/aa313d30/ambari-web/app/views/main/service/reassign/step5_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/reassign/step5_view.js b/ambari-web/app/views/main/service/reassign/step5_view.js
index 80846a8..5b7e53f 100644
--- a/ambari-web/app/views/main/service/reassign/step5_view.js
+++ b/ambari-web/app/views/main/service/reassign/step5_view.js
@@ -34,7 +34,7 @@ App.ReassignMasterWizardStep5View = Em.View.extend({
var ha = '';
if (this.get('controller.content.reassign.component_name') === 'NAMENODE' && App.get('isHaEnabled')) {
ha = '_ha';
- var nnStartedHost = this.get('controller.content.masterComponentHosts').filterProperty('component', 'NAMENODE').mapProperty('hostName').without(this.get('controller.content.reassignHosts.target'));
+ var nnStartedHost = this.get('controller.content.masterComponentHosts').filterProperty('component', 'NAMENODE').mapProperty('hostName').without(sourceHost);
}
return Em.I18n.t('services.reassign.step5.body.' + this.get('controller.content.reassign.component_name').toLowerCase() + ha).format(componentDir, sourceHost, targetHost, this.get('controller.content.hdfsUser'), nnStartedHost,this.get('controller.content.group'), componentDirCmd);
}.property('controller.content.reassign.component_name', 'controller.content.componentDir', 'controller.content.masterComponentHosts', 'controller.content.reassign.host_id', 'controller.content.hdfsUser'),