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 A3C19200D1E for ; Tue, 12 Sep 2017 12:04:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A2C381609CC; Tue, 12 Sep 2017 10:04:27 +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 E380D1609D1 for ; Tue, 12 Sep 2017 12:04:26 +0200 (CEST) Received: (qmail 86071 invoked by uid 500); 12 Sep 2017 10:04: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 85163 invoked by uid 99); 12 Sep 2017 10:04: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; Tue, 12 Sep 2017 10:04:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BD842F57FB; Tue, 12 Sep 2017 10:04:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lpuskas@apache.org To: commits@ambari.apache.org Date: Tue, 12 Sep 2017 10:04:48 -0000 Message-Id: In-Reply-To: <88d20886377e4bd7a64a2fe92e04fd9f@git.apache.org> References: <88d20886377e4bd7a64a2fe92e04fd9f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/57] [abbrv] ambari git commit: AMBARI-21877 - Spark Service check failure in Ambari with kerberos enabled (Mingjie Tang via jonathanhurley) archived-at: Tue, 12 Sep 2017 10:04:27 -0000 AMBARI-21877 - Spark Service check failure in Ambari with kerberos enabled (Mingjie Tang via jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e142dcb6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e142dcb6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e142dcb6 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: e142dcb6ca4f19fa986208dd69acde5a6e50cc67 Parents: de94def Author: Jonathan Hurley Authored: Fri Sep 8 09:22:07 2017 -0400 Committer: Jonathan Hurley Committed: Fri Sep 8 09:22:50 2017 -0400 ---------------------------------------------------------------------- .../SPARK/1.2.1/package/scripts/service_check.py | 3 ++- .../SPARK2/2.0.0/package/scripts/service_check.py | 3 ++- .../test/python/stacks/2.2/SPARK/test_spark_service_check.py | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e142dcb6/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/service_check.py index 4699b2e..64641d0 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/service_check.py @@ -37,7 +37,8 @@ class SparkServiceCheck(Script): Execute(format("curl -s -o /dev/null -w'%{{http_code}}' --negotiate -u: -k http://{spark_history_server_host}:{spark_history_ui_port} | grep 200"), tries=5, try_sleep=3, - logoutput=True + logoutput=True, + user=params.spark_user ) if params.has_livyserver: live_livyserver_host = ""; http://git-wip-us.apache.org/repos/asf/ambari/blob/e142dcb6/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py index 7667191..01d7370 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py @@ -38,7 +38,8 @@ class SparkServiceCheck(Script): Execute(format("curl -s -o /dev/null -w'%{{http_code}}' --negotiate -u: -k {spark_history_scheme}://{spark_history_server_host}:{spark_history_ui_port} | grep 200"), tries=5, try_sleep=3, - logoutput=True + logoutput=True, + user=params.spark_user ) if params.has_livyserver: live_livyserver_host = "" http://git-wip-us.apache.org/repos/asf/ambari/blob/e142dcb6/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py index c2c3e03..3f6c410 100644 --- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py +++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_service_check.py @@ -39,7 +39,8 @@ class TestServiceCheck(RMFTestCase): self.assertResourceCalled('Execute', "curl -s -o /dev/null -w'%{http_code}' --negotiate -u: -k http://localhost:18080 | grep 200", tries = 5, try_sleep = 3, - logoutput = True + logoutput = True, + user = 'spark' ) self.assertNoMoreResources() @@ -58,6 +59,9 @@ class TestServiceCheck(RMFTestCase): self.assertResourceCalled('Execute', "curl -s -o /dev/null -w'%{http_code}' --negotiate -u: -k http://localhost:18080 | grep 200", tries = 5, try_sleep = 3, - logoutput = True + logoutput = True, + user = 'spark' ) self.assertNoMoreResources() + +