Repository: ambari Updated Branches: refs/heads/branch-2.5 95aa867b2 -> d07c86c45
AMBARI-19539. Spark2 Service check fails on WE enabled cluster (Bikas Saha via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d07c86c4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d07c86c4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d07c86c4 Branch: refs/heads/branch-2.5 Commit: d07c86c454f6b7e090779127a9b1c86b47394947 Parents: 95aa867 Author: Sumit Mohanty <[email protected]> Authored: Fri Jan 13 15:43:01 2017 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Fri Jan 13 15:43:41 2017 -0800 ---------------------------------------------------------------------- .../common-services/SPARK2/2.0.0/package/scripts/params.py | 5 ++++- .../SPARK2/2.0.0/package/scripts/service_check.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d07c86c4/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py index 12966bb..3a70011 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py @@ -116,10 +116,13 @@ else: ui_ssl_enabled = default("configurations/spark2-defaults/spark.ssl.enabled", False) spark_yarn_historyServer_address = default(spark_history_server_host, "localhost") - +spark_history_scheme = "http" spark_history_ui_port = config['configurations']['spark2-defaults']['spark.history.ui.port'] + if ui_ssl_enabled: spark_history_ui_port = str(int(spark_history_ui_port) + 400) + spark_history_scheme = "https" + spark_env_sh = config['configurations']['spark2-env']['content'] spark_log4j_properties = config['configurations']['spark2-log4j-properties']['content'] http://git-wip-us.apache.org/repos/asf/ambari/blob/d07c86c4/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 71de727..bcdf118 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 @@ -36,7 +36,7 @@ class SparkServiceCheck(Script): livy_kinit_cmd = format("{kinit_path_local} -kt {smoke_user_keytab} {smokeuser_principal}; ") Execute(livy_kinit_cmd, user=params.livy2_user) - Execute(format("curl -s -o /dev/null -w'%{{http_code}}' --negotiate -u: -k http://{spark_history_server_host}:{spark_history_ui_port} | grep 200"), + 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
