Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 89A5518B94 for ; Fri, 19 Feb 2016 13:26:34 +0000 (UTC) Received: (qmail 70489 invoked by uid 500); 19 Feb 2016 13:26:18 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 70134 invoked by uid 500); 19 Feb 2016 13:26:18 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 69797 invoked by uid 99); 19 Feb 2016 13:26:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Feb 2016 13:26:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 37DB9E09C5; Fri, 19 Feb 2016 13:26:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmitriusan@apache.org To: commits@ambari.apache.org Date: Fri, 19 Feb 2016 13:26:20 -0000 Message-Id: <0b7539ef41bc4852b9a2bcc9aae0fcdb@git.apache.org> In-Reply-To: <65cd973a00eb487d97a65ed3eac88f18@git.apache.org> References: <65cd973a00eb487d97a65ed3eac88f18@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Thu Feb 18 14:08:58 2016 +0200 Committer: Alex Antonenko 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 = { '', 'services.reassign.step5.body.app_timeline_server': '
' + '
    ' + - '
  1. Copy {7}/leveldb-timeline-store.ldb from the source host {1} to {7}/leveldb-timeline-store.ldb on the target host {2}.
    2. ' + + '
  2. Copy {7}/{8} from the source host {1} to {7}/{8} on the target host {2}.
    3. ' + '
  3. Login to the target host {2} and change permissions by running:' + - '
    chown -R {3}:{5} {7}/leveldb-timeline-store.ldb
    4. ' + - '
    chmod -R 700 {7}/leveldb-timeline-store.ldb
    ' + + '
    chown -R {3}:{5} {7}/{8}
    ' + + '
    chmod -R 700 {7}/{8}
    ' + '
' + '
', 'services.reassign.step5.body.securityNotice': '
Note: 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'), /**