Repository: ambari Updated Branches: refs/heads/trunk de94def93 -> e142dcb6c
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/trunk Commit: e142dcb6ca4f19fa986208dd69acde5a6e50cc67 Parents: de94def Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Fri Sep 8 09:22:07 2017 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> 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() + +