You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2015/10/08 16:16:19 UTC
ambari git commit: AMBARI-13356 Manual commands given by Ambari are
incorrect when yarn.timeline-service.leveldb-timeline-store.path is
non-default. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 8dbf9415e -> 165eed044
AMBARI-13356 Manual commands given by Ambari are incorrect when yarn.timeline-service.leveldb-timeline-store.path is non-default. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/165eed04
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/165eed04
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/165eed04
Branch: refs/heads/branch-2.1
Commit: 165eed044c526f2f0deea840fc0b949e11f03894
Parents: 8dbf941
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Thu Oct 8 16:33:00 2015 +0300
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Thu Oct 8 17:15:49 2015 +0300
----------------------------------------------------------------------
ambari-web/app/messages.js | 6 +++---
ambari-web/app/views/main/service/reassign/step5_view.js | 10 ++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/165eed04/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1a8816f..f4134a9 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2009,10 +2009,10 @@ Em.I18n.translations = {
'</div>',
'services.reassign.step5.body.app_timeline_server': '<div class="alert alert-info">' +
'<ol>' +
- '<li>Copy <b>/hadoop/yarn/timeline/leveldb-timeline-store.ldb</b> from the source host <b>{1}</b> to <b>/hadoop/yarn/timeline/leveldb-timeline-store.ldb</b> on the target host <b>{2}</b>.</li>' +
+ '<li>Copy <b>{7}/leveldb-timeline-store.ldb</b> from the source host <b>{1}</b> to <b>{7}/leveldb-timeline-store.ldb</b> on the target host <b>{2}</b>.</li>' +
'<li>Login to the target host <b>{2}</b> and change permissions by running:' +
- '<div class="code-snippet">chown -R {3}:{5} /hadoop/yarn/timeline/leveldb-timeline-store.ldb</div></li>' +
- '<div class="code-snippet">chmod -R 700 /hadoop/yarn/timeline/leveldb-timeline-store.ldb</div></li>' +
+ '<div class="code-snippet">chown -R {3}:{5} {7}/leveldb-timeline-store.ldb</div></li>' +
+ '<div class="code-snippet">chmod -R 700 {7}/leveldb-timeline-store.ldb</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/165eed04/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 cc7805f..5eeba14 100644
--- a/ambari-web/app/views/main/service/reassign/step5_view.js
+++ b/ambari-web/app/views/main/service/reassign/step5_view.js
@@ -32,18 +32,20 @@ App.ReassignMasterWizardStep5View = Em.View.extend({
var sourceHost = this.get('controller.content.reassignHosts.source');
var targetHost = this.get('controller.content.reassignHosts.target');
var ha = '';
+ var user = this.get('controller.content.hdfsUser'), path;
+
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(sourceHost);
}
- var user = this.get('controller.content.hdfsUser');
-
- if(this.get('controller.content.reassign.component_name') === 'APP_TIMELINE_SERVER') {
+ if (this.get('controller.content.reassign.component_name') === 'APP_TIMELINE_SERVER') {
user = this.get('controller.content.serviceProperties.yarn-env.yarn_user');
+ path = this.get('controller.content.serviceProperties.yarn-site')['yarn.timeline-service.leveldb-timeline-store.path'];
}
- return Em.I18n.t('services.reassign.step5.body.' + this.get('controller.content.reassign.component_name').toLowerCase() + ha).format(componentDir, sourceHost, targetHost, user, nnStartedHost,this.get('controller.content.group'), componentDirCmd);
+ return Em.I18n.t('services.reassign.step5.body.' + this.get('controller.content.reassign.component_name').toLowerCase() + ha).
+ format(componentDir, sourceHost, targetHost, user, nnStartedHost,this.get('controller.content.group'), componentDirCmd, path);
}.property('controller.content.reassign.component_name', 'controller.content.componentDir', 'controller.content.masterComponentHosts', 'controller.content.reassign.host_id', 'controller.content.hdfsUser'),
/**