AMBARI-18091. Fix Spark2 service check failure when WE is enabled (Saisai Shao via smohanty)

ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py

@@ -108,9 +108,13 @@ else:
   spark_history_server_host = "localhost"
 
 # spark-defaults params
+ui_ssl_enabled = default("configurations/spark2-defaults/spark.ssl.enabled", False)
+
 spark_yarn_historyServer_address = default(spark_history_server_host, "localhost")
 
 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_env_sh = config['configurations']['spark2-env']['content']
 spark_log4j_properties = config['configurations']['spark2-log4j-properties']['content']

ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/service_check.py

@@ -33,7 +33,8 @@ class SparkServiceCheck(Script):
       spark_kinit_cmd = format("{kinit_path_local} -kt {spark_kerberos_keytab} {spark_principal}; ")
       Execute(spark_kinit_cmd, user=params.spark_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"),
+    scheme = "https" if params.ui_ssl_enabled else "http"
+    Execute(format("curl -s -o /dev/null -w'%{{http_code}}' --negotiate -u: -k {scheme}://{spark_history_server_host}:{spark_history_ui_port} | grep 200"),
       tries = 10,
       try_sleep=3,
       logoutput=True