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 B86F320049B for ; Mon, 14 Aug 2017 22:18:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B6FA3165C91; Mon, 14 Aug 2017 20:18:06 +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 1707E165C8C for ; Mon, 14 Aug 2017 22:18:05 +0200 (CEST) Received: (qmail 27324 invoked by uid 500); 14 Aug 2017 20:18:04 -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 27142 invoked by uid 99); 14 Aug 2017 20:18:04 -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, 14 Aug 2017 20:18:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6B25F5661; Mon, 14 Aug 2017 20:18:03 +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: Mon, 14 Aug 2017 20:18:03 -0000 Message-Id: <07dadd64525148b382d825d016229a94@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/17] ambari git commit: Merge branch 'branch-2.6' into branch-feature-AMBARI-21450 archived-at: Mon, 14 Aug 2017 20:18:06 -0000 Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21450 c35a834d7 -> bbd751130 Merge branch 'branch-2.6' into branch-feature-AMBARI-21450 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cf1ab757 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cf1ab757 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cf1ab757 Branch: refs/heads/branch-feature-AMBARI-21450 Commit: cf1ab7575eb9872eac66dafc504e62a4da44c41b Parents: 2307c9d 6d50cd6 Author: Jonathan Hurley Authored: Thu Aug 10 13:11:09 2017 -0400 Committer: Jonathan Hurley Committed: Thu Aug 10 13:48:14 2017 -0400 ---------------------------------------------------------------------- .../upgrade/StackUpgradeFinishListener.java | 13 +++++++++++++ .../metadata/CachedRoleCommandOrderProvider.java | 10 ++++++++-- ambari-server/src/main/resources/scripts/configs.py | 2 +- .../stacks/BigInsights/4.2.5/repos/repoinfo.xml | 16 ++++++++++++++-- .../HDP/2.0.6/hooks/before-START/scripts/params.py | 6 +++--- .../upgrade/StackUpgradeFinishListenerTest.java | 14 ++++++-------- 6 files changed, 45 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cf1ab757/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py ---------------------------------------------------------------------- diff --cc ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py index bd86b50,bd86b50..de53150 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py @@@ -331,10 -331,10 +331,10 @@@ if dfs_ha_enabled namenode_rpc = nn_host pass pass --elif 'dfs.namenode.rpc-address' in config['configurations']['hdfs-site']: -- namenode_rpc = default('/configurations/hdfs-site/dfs.namenode.rpc-address', None) else: -- namenode_rpc = default('/configurations/core-site/fs.defaultFS', None) ++ namenode_rpc = default('/configurations/hdfs-site/dfs.namenode.rpc-address', None) ++ if namenode_rpc is None: ++ namenode_rpc = default('/configurations/core-site/fs.defaultFS', None) if namenode_rpc: port_str = namenode_rpc.split(':')[-1].strip()