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 2014/04/18 18:13:43 UTC
git commit: AMBARI-5511. Misleading hardcoded command in paragraph 2
on step "Manual commands" of "Move Master" wizard (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 60c96ae90 -> 0a21401f6
AMBARI-5511. Misleading hardcoded command in paragraph 2 on step "Manual commands" of "Move Master" wizard (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a21401f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a21401f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a21401f
Branch: refs/heads/trunk
Commit: 0a21401f6a096cf86ccc247058dcd175d908bf96
Parents: 60c96ae
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Apr 18 19:06:44 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Apr 18 19:06:44 2014 +0300
----------------------------------------------------------------------
ambari-web/app/messages.js | 4 ++--
ambari-web/app/views/main/service/reassign/step5_view.js | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a21401f/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 0d3fe77..16ea945 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1325,7 +1325,7 @@ Em.I18n.translations = {
'<ol>' +
'<li>Copy the contents of <b>{0}</b> on the source host <b>{1}</b> to <b>{0}</b> on the target host <b>{2}</b>.</li>' +
'<li>Login to the target host <b>{2}</b> and change permissions for the NameNode dirs by running:' +
- '<div class="code-snippet">chown -R {3}:{5} /hadoop/hdfs/namenode/</div></li>' +
+ '<div class="code-snippet">chown -R {3}:{5} {6}</div></li>' +
'<li>Create marker directory by running:' +
'<div class="code-snippet">mkdir -p /var/run/hadoop/hdfs/namenode/formatted</div></li>' +
'</ol>' +
@@ -1352,7 +1352,7 @@ Em.I18n.translations = {
'<ol>' +
'<li>Copy the contents of <b>{0}</b> on the source host <b>{1}</b> to <b>{0}</b> on the target host <b>{2}</b>.</li>' +
'<li>Login to the target host <b>{2}</b> and change permissions for the SNameNode dirs by running:' +
- '<div class="code-snippet">chown -R {3}:{5} /hadoop/hdfs/namesecondary/</div></li>' +
+ '<div class="code-snippet">chown -R {3}:{5} {6}</div></li>' +
'</ol>' +
'</div>',
'services.reassign.step5.body.securityNotice': '<div class="alert alert-info"> <div class="alert alert-warn"> <strong>Note: </strong> Secure cluster' +
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a21401f/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 cd62ccb..80846a8 100644
--- a/ambari-web/app/views/main/service/reassign/step5_view.js
+++ b/ambari-web/app/views/main/service/reassign/step5_view.js
@@ -28,6 +28,7 @@ App.ReassignMasterWizardStep5View = Em.View.extend({
return '';
}
var componentDir = this.get('controller.content.componentDir');
+ var componentDirCmd = componentDir.replace(/,/g, ' ');
var sourceHost = this.get('controller.content.reassignHosts.source');
var targetHost = this.get('controller.content.reassignHosts.target');
var ha = '';
@@ -35,7 +36,7 @@ App.ReassignMasterWizardStep5View = Em.View.extend({
ha = '_ha';
var nnStartedHost = this.get('controller.content.masterComponentHosts').filterProperty('component', 'NAMENODE').mapProperty('hostName').without(this.get('controller.content.reassignHosts.target'));
}
- 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'));
+ 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'),
securityNotice: function () {