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 9B851200CAE for ; Wed, 21 Jun 2017 21:10:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 99C69160BD0; Wed, 21 Jun 2017 19:10:13 +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 E240D160BD5 for ; Wed, 21 Jun 2017 21:10:12 +0200 (CEST) Received: (qmail 64937 invoked by uid 500); 21 Jun 2017 19:10:12 -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 64927 invoked by uid 99); 21 Jun 2017 19:10:12 -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; Wed, 21 Jun 2017 19:10:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0C26DDFA83; Wed, 21 Jun 2017 19:10:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jluniya@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-21135: Kafka service fails to start during EU from HDF 202 to 30 while resolving /etc/kafka/conf (jluniya) Date: Wed, 21 Jun 2017 19:10:12 +0000 (UTC) archived-at: Wed, 21 Jun 2017 19:10:13 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.5 bf8f70773 -> 7cc6701bb AMBARI-21135: Kafka service fails to start during EU from HDF 202 to 30 while resolving /etc/kafka/conf (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7cc6701b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7cc6701b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7cc6701b Branch: refs/heads/branch-2.5 Commit: 7cc6701bb03031779d322ddce14d4c02277ef9b0 Parents: bf8f707 Author: Jayush Luniya Authored: Wed Jun 21 12:10:07 2017 -0700 Committer: Jayush Luniya Committed: Wed Jun 21 12:10:07 2017 -0700 ---------------------------------------------------------------------- .../main/resources/custom_actions/scripts/install_packages.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7cc6701b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py index 112abe3..3a93389 100644 --- a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py +++ b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py @@ -40,7 +40,7 @@ from resource_management.libraries.functions.version import format_stack_version from resource_management.libraries.functions.repo_version_history \ import read_actual_version_from_history_file, write_actual_version_to_history_file, REPO_VERSION_HISTORY_FILE from resource_management.libraries.script.script import Script -from resource_management.core.resources.system import Execute +from resource_management.core.resources.system import Link from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions import StackFeature @@ -205,6 +205,11 @@ class InstallPackages(Script): Logger.info("Configuration symlinks are not needed for {0}".format(stack_version)) return + # After upgrading hdf-select package from HDF-2.X to HDF-3.Y, we need to create this symlink + if self.stack_name.upper() == "HDF" \ + and not os.path.exists("/usr/bin/conf-select") and os.path.exists("/usr/bin/hdfconf-select"): + Link("/usr/bin/conf-select", to = "/usr/bin/hdfconf-select") + for package_name, directories in conf_select.get_package_dirs().iteritems(): # if already on HDP 2.3, then we should skip making conf.backup folders if self.current_stack_version_formatted and check_stack_feature(StackFeature.CONFIG_VERSIONING, self.current_stack_version_formatted):