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 3737D200C1B for ; Mon, 30 Jan 2017 16:40:26 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 33784160B41; Mon, 30 Jan 2017 15:40:26 +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 6C3BB160B71 for ; Mon, 30 Jan 2017 16:40:24 +0100 (CET) Received: (qmail 72028 invoked by uid 500); 30 Jan 2017 15:40:23 -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 71504 invoked by uid 99); 30 Jan 2017 15:40:22 -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; Mon, 30 Jan 2017 15:40:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9A7E5DFBAD; Mon, 30 Jan 2017 15:40:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Mon, 30 Jan 2017 15:40:29 -0000 Message-Id: <399505d99cbf4d058a2537fd3e5a523b@git.apache.org> In-Reply-To: <96589e72473b4eac9d65669845a0b732@git.apache.org> References: <96589e72473b4eac9d65669845a0b732@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/30] ambari git commit: AMBARI-19761. HSI start fails after Ambari upgrade with Unrecognized option: --skiphadoopversion and --skiphbasecp (Swapan Shridhar via smohanty) archived-at: Mon, 30 Jan 2017 15:40:26 -0000 AMBARI-19761. HSI start fails after Ambari upgrade with Unrecognized option: --skiphadoopversion and --skiphbasecp (Swapan Shridhar via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/771c9c01 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/771c9c01 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/771c9c01 Branch: refs/heads/branch-dev-patch-upgrade Commit: 771c9c011b3ea00e4ad0171b04bd851c7ee74ee0 Parents: c600985 Author: Sumit Mohanty Authored: Fri Jan 27 17:53:04 2017 -0800 Committer: Sumit Mohanty Committed: Fri Jan 27 17:53:04 2017 -0800 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/771c9c01/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py index 924c88c..ce10824 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py @@ -284,9 +284,9 @@ class HiveServerInteractiveDefault(HiveServerInteractive): cmd = format("{stack_root}/current/hive-server2-hive2/bin/hive --service llap --instances {params.num_llap_nodes}" " --slider-am-container-mb {params.slider_am_container_mb} --size {params.llap_daemon_container_size}m" " --cache {params.hive_llap_io_mem_size}m --xmx {params.llap_heap_size}m --loglevel {params.llap_log_level}" - " {params.llap_extra_slider_opts} --skiphadoopversion --skiphbasecp --output {LLAP_PACKAGE_CREATION_PATH}/{unique_name}") + " {params.llap_extra_slider_opts} --output {LLAP_PACKAGE_CREATION_PATH}/{unique_name}") - # '--slider-placement' param is supported from HDP Hive GA version. + # Append params that are supported from Hive llap GA version. if params.stack_supports_hive_interactive_ga: # Figure out the Slider Anti-affinity to be used. # YARN does not support anti-affinity, and therefore Slider implements AA by the means of exclusion lists, i.e, it @@ -300,7 +300,7 @@ class HiveServerInteractiveDefault(HiveServerInteractive): else: Logger.info("Setting slider_placement: 4, as llap_daemon_container_size : {0} <= 0.5 * " "YARN NodeManager Memory({1})".format(params.llap_daemon_container_size, params.yarn_nm_mem)) - cmd += format(" --slider-placement {slider_placement}") + cmd += format(" --slider-placement {slider_placement} --skiphadoopversion --skiphbasecp") if params.security_enabled: llap_keytab_splits = params.hive_llap_keytab_file.split("/")