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 1A799200CE9 for ; Fri, 4 Aug 2017 15:16:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1922516D89A; Fri, 4 Aug 2017 13:16: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 5C53516D895 for ; Fri, 4 Aug 2017 15:16:12 +0200 (CEST) Received: (qmail 16285 invoked by uid 500); 4 Aug 2017 13:16:11 -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 16258 invoked by uid 99); 4 Aug 2017 13:16:10 -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, 04 Aug 2017 13:16:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2EFDE96C0; Fri, 4 Aug 2017 13:16:07 +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 Date: Fri, 04 Aug 2017 13:16:07 -0000 Message-Id: <88f451a4c7bf47bc90fa9677b95fd8d2@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/8] ambari git commit: AMBARI-21554. Regenerating keytabs fails in Stack Advisor after upgrading Ambari archived-at: Fri, 04 Aug 2017 13:16:13 -0000 AMBARI-21554. Regenerating keytabs fails in Stack Advisor after upgrading Ambari Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d72f3293 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d72f3293 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d72f3293 Branch: refs/heads/branch-2.6 Commit: d72f32936c502d6420f4e0623c2adab1b0646247 Parents: b167d3b Author: Attila Doroszlai Authored: Thu Aug 3 14:37:44 2017 +0200 Committer: Attila Doroszlai Committed: Thu Aug 3 23:06:22 2017 +0200 ---------------------------------------------------------------------- ambari-server/src/main/resources/scripts/stack_advisor.py | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d72f3293/ambari-server/src/main/resources/scripts/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/scripts/stack_advisor.py b/ambari-server/src/main/resources/scripts/stack_advisor.py index 66ab248..8e314ff 100755 --- a/ambari-server/src/main/resources/scripts/stack_advisor.py +++ b/ambari-server/src/main/resources/scripts/stack_advisor.py @@ -42,6 +42,11 @@ STACK_ADVISOR_DEFAULT_IMPL_CLASS = 'DefaultStackAdvisor' STACK_ADVISOR_IMPL_PATH_TEMPLATE = os.path.join(SCRIPT_DIRECTORY, './../stacks/{0}/{1}/services/stack_advisor.py') STACK_ADVISOR_IMPL_CLASS_TEMPLATE = '{0}{1}StackAdvisor' +# Stack advisor may have deeper inheritance than the stack, +# eg. BigInsights 4.0 is top-level, but its stack advisor inherits from HDP 2.5. +# The extra classes are defined in the following directory: +STACK_ADVISOR_BASE_MODULES = os.path.join(SCRIPT_DIRECTORY, '../stacks/{0}/{1}/stack-advisor') + ADVISOR_CONTEXT = "advisor_context" CALL_TYPE = "call_type" @@ -139,6 +144,8 @@ def instantiateStackAdvisor(stackName, stackVersion, parentVersions): versions = [stackVersion] versions.extend(parentVersions) + sys.path.append(STACK_ADVISOR_BASE_MODULES.format(stackName, versions[-1])) + for version in reversed(versions): try: path = STACK_ADVISOR_IMPL_PATH_TEMPLATE.format(stackName, version)