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 CF1F9200CA3 for ; Wed, 17 May 2017 22:51:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CDEFA160BE3; Wed, 17 May 2017 20:51:37 +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 2901A160BCB for ; Wed, 17 May 2017 22:51:37 +0200 (CEST) Received: (qmail 35980 invoked by uid 500); 17 May 2017 20:51:35 -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 35441 invoked by uid 99); 17 May 2017 20:51:35 -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, 17 May 2017 20:51:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6052DF219F; Wed, 17 May 2017 20:51:35 +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 Date: Wed, 17 May 2017 20:51:44 -0000 Message-Id: In-Reply-To: <707c79548cfe42f49ea5abf6649818e6@git.apache.org> References: <707c79548cfe42f49ea5abf6649818e6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/25] ambari git commit: AMBARI-21028. The credential cache for livy is messed up (Weiqing Yang via smohanty) archived-at: Wed, 17 May 2017 20:51:38 -0000 AMBARI-21028. The credential cache for livy is messed up (Weiqing Yang via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/704eb525 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/704eb525 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/704eb525 Branch: refs/heads/branch-feature-AMBARI-14714 Commit: 704eb5254545bcdb8b7a9a60b2518124e7e4b265 Parents: 9adffcf Author: Sumit Mohanty Authored: Tue May 16 19:14:35 2017 -0700 Committer: Sumit Mohanty Committed: Tue May 16 19:15:45 2017 -0700 ---------------------------------------------------------------------- .../SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py | 2 +- .../SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/704eb525/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py index 746a98e..f15e747 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_livy_port.py @@ -82,7 +82,7 @@ def execute(configurations={}, parameters={}, host_name=None): if host_name is None: host_name = socket.getfqdn() - livyuser = LIVYUSER_DEFAULT + livyuser = configurations[SMOKEUSER_KEY] security_enabled = False if SECURITY_ENABLED_KEY in configurations: http://git-wip-us.apache.org/repos/asf/ambari/blob/704eb525/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py index 44c284f..d69f663 100644 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_livy_port.py @@ -82,7 +82,7 @@ def execute(configurations={}, parameters={}, host_name=None): if host_name is None: host_name = socket.getfqdn() - livyuser = LIVYUSER_DEFAULT + livyuser = configurations[SMOKEUSER_KEY] security_enabled = False if SECURITY_ENABLED_KEY in configurations: