Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3939E200B42 for ; Sun, 26 Jun 2016 03:53:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2BC86160A67; Sun, 26 Jun 2016 01:53:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 73821160A66 for ; Sun, 26 Jun 2016 03:53:20 +0200 (CEST) Received: (qmail 71659 invoked by uid 500); 26 Jun 2016 01:53:19 -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 71650 invoked by uid 99); 26 Jun 2016 01:53:19 -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; Sun, 26 Jun 2016 01:53:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 43D88DFDA9; Sun, 26 Jun 2016 01:53:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Message-Id: <7d46110e7d584df6978cb623e78909c7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17431 - Ambari Is Initializing the Metastore Using the Wrong schematool Binary on HDP 2.5 (jonathanhurley) Date: Sun, 26 Jun 2016 01:53:19 +0000 (UTC) archived-at: Sun, 26 Jun 2016 01:53:21 -0000 Repository: ambari Updated Branches: refs/heads/trunk 08f62c868 -> a286924df AMBARI-17431 - Ambari Is Initializing the Metastore Using the Wrong schematool Binary on HDP 2.5 (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a286924d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a286924d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a286924d Branch: refs/heads/trunk Commit: a286924dfcba17cb7ebceda65e1680c4880547e3 Parents: 08f62c8 Author: Jonathan Hurley Authored: Fri Jun 24 15:39:39 2016 -0400 Committer: Jonathan Hurley Committed: Sat Jun 25 21:53:11 2016 -0400 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a286924d/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py index 2afee3b..17f7380 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py @@ -99,10 +99,15 @@ hive_user_home_dir = "/home/hive" hive_server2_hive2_dir = None hive_server2_hive2_lib = None if check_stack_feature(StackFeature.HIVE_SERVER_INTERACTIVE, stack_version_unformatted): - hive_schematool_ver_bin = format('{stack_root}/{version}/hive2/bin') - hive_schematool_bin = format('{stack_root}/current/{component_directory}/bin') + # the name of the hiveserver2-hive2 component hive_server2_hive2_component = status_params.SERVER_ROLE_DIRECTORY_MAP["HIVE_SERVER_INTERACTIVE"] + # when using the version, we can just specify the component as "hive2" + hive_schematool_ver_bin = format('{stack_root}/{version}/hive2/bin') + + # use the schematool which ships with hive2 + hive_schematool_bin = format('{stack_root}/current/{hive_server2_hive2_component}/bin') + # //hive2 (as opposed to //hive) hive_server2_hive2_dir = format('{stack_root}/current/{hive_server2_hive2_component}')