You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/02/19 14:26:20 UTC
[03/21] ambari git commit: AMBARI-15088. Incorrect information shown
for 'leveldb-timeline-store' location while moving App Timeline Server
component. (alexantonenko)
AMBARI-15088. Incorrect information shown for 'leveldb-timeline-store' location while moving App Timeline Server component. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0c568cc8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0c568cc8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0c568cc8
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0c568cc8a20f1f33c1476f7c267c9245efd6dd0f
Parents: 2926a4e
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Feb 18 14:08:58 2016 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Feb 18 17:49:31 2016 +0200
----------------------------------------------------------------------
ambari-web/app/messages.js | 6 +++---
.../app/views/main/service/reassign/step5_view.js | 16 +++++++++-------
2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0c568cc8/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 8186088..9d24b4f 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2093,10 +2093,10 @@ Em.I18n.translations = {
'</div>',
'services.reassign.step5.body.app_timeline_server': '<div class="alert alert-info">' +
'<ol>' +
- '<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>Copy <b>{7}/{8}</b> from the source host <b>{1}</b> to <b>{7}/{8}</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} {7}/leveldb-timeline-store.ldb</div></li>' +
- '<div class="code-snippet">chmod -R 700 {7}/leveldb-timeline-store.ldb</div></li>' +
+ '<div class="code-snippet">chown -R {3}:{5} {7}/{8}</div></li>' +
+ '<div class="code-snippet">chmod -R 700 {7}/{8}</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/0c568cc8/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 5eeba14..066b23b 100644
--- a/ambari-web/app/views/main/service/reassign/step5_view.js
+++ b/ambari-web/app/views/main/service/reassign/step5_view.js
@@ -27,12 +27,14 @@ App.ReassignMasterWizardStep5View = Em.View.extend({
if (!this.get('controller.content.componentsWithManualCommands').contains(this.get('controller.content.reassign.component_name'))) {
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 = '';
- var user = this.get('controller.content.hdfsUser'), path;
+ var
+ atsDir = App.get('isHadoop23Stack') ? "timeline-state-store.ldb" : "leveldb-timeline-store.ldb",
+ componentDir = this.get('controller.content.componentDir') || '',
+ componentDirCmd = componentDir.replace(/,/g, ' '),
+ sourceHost = this.get('controller.content.reassignHosts.source'),
+ targetHost = this.get('controller.content.reassignHosts.target'),
+ ha = '',
+ user = this.get('controller.content.hdfsUser'), path;
if (this.get('controller.content.reassign.component_name') === 'NAMENODE' && App.get('isHaEnabled')) {
ha = '_ha';
@@ -45,7 +47,7 @@ App.ReassignMasterWizardStep5View = Em.View.extend({
}
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);
+ format(componentDir, sourceHost, targetHost, user, nnStartedHost,this.get('controller.content.group'), componentDirCmd, path, atsDir);
}.property('controller.content.reassign.component_name', 'controller.content.componentDir', 'controller.content.masterComponentHosts', 'controller.content.reassign.host_id', 'controller.content.hdfsUser'),
/**