Repository: ambari Updated Branches: refs/heads/trunk ebc47ef95 -> 060d17561
AMBARI-17791 Spark service check fails on node with stopped Livy server (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/060d1756 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/060d1756 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/060d1756 Branch: refs/heads/trunk Commit: 060d175610e4eda822b3fbad992fd7e7f5fbbd62 Parents: ebc47ef Author: Dmytro Sen <[email protected]> Authored: Tue Jul 19 19:54:53 2016 +0300 Committer: Dmytro Sen <[email protected]> Committed: Tue Jul 19 19:54:53 2016 +0300 ---------------------------------------------------------------------- .../SPARK/1.2.1/package/scripts/params.py | 1 - .../SPARK/1.2.1/package/scripts/service_check.py | 17 +++++++++++++---- .../stacks/HDP/2.5/role_command_order.json | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/060d1756/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py index 227791a..61f73fb 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py @@ -218,7 +218,6 @@ if stack_version_formatted and check_stack_feature(StackFeature.SPARK_LIVY, stac livy_livyserver_hosts = default("/clusterHostInfo/livy_server_hosts", []) if len(livy_livyserver_hosts) > 0: - livy_livyserver_host = livy_livyserver_hosts[0] has_livyserver = True livy_livyserver_port = default('configurations/livy-conf/livy.server.port',8998) http://git-wip-us.apache.org/repos/asf/ambari/blob/060d1756/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 297761e..9d74779 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 @@ -39,13 +39,22 @@ class SparkServiceCheck(Script): try_sleep=3, logoutput=True ) - if params.has_livyserver and params.livy_livyserver_host != "localhost" and params.livy_livyserver_host != "0.0.0.0": - Execute(format("curl -s -o /dev/null -w'%{{http_code}}' --negotiate -u: -k http://{livy_livyserver_host}:{livy_livyserver_port}/sessions | grep 200"), - tries=5, - try_sleep=3, + if params.has_livyserver: + live_livyserver_host = ""; + for livyserver_host in params.livy_livyserver_hosts: + try: + Execute(format("curl -s -o /dev/null -w'%{{http_code}}' --negotiate -u: -k http://{livyserver_host}:{livy_livyserver_port}/sessions | grep 200"), + tries=3, + try_sleep=1, logoutput=True, user=params.livy_user ) + live_livyserver_host = livyserver_host + break + except: + pass + if len(params.livy_livyserver_hosts) > 0 and live_livyserver_host == "": + raise Fail(format("Connection to all Livy servers failed")) if __name__ == "__main__": SparkServiceCheck().execute() http://git-wip-us.apache.org/repos/asf/ambari/blob/060d1756/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json index 40e8ff8..9b21ed0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/role_command_order.json @@ -11,8 +11,8 @@ "HIVE_SERVER_INTERACTIVE-RESTART": ["NODEMANAGER-RESTART", "MYSQL_SERVER-RESTART"], "HIVE_SERVICE_CHECK-SERVICE_CHECK": ["HIVE_SERVER-START", "HIVE_METASTORE-START", "WEBHCAT_SERVER-START", "HIVE_SERVER_INTERACTIVE-START"], "RANGER_ADMIN-START": ["ZOOKEEPER_SERVER-START", "LOGSEARCH_SOLR-START"], - "LIVY_SERVER-START" : ["NAMENODE-START", "DATANODE-START"], - "SPARK_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START","LIVY_SERVER-START"], + "LIVY_SERVER-START" : ["NAMENODE-START", "DATANODE-START", "APP_TIMELINE_SERVER-START"], + "SPARK_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK_JOBHISTORYSERVER-START", "LIVY_SERVER-START"], "SPARK2_SERVICE_CHECK-SERVICE_CHECK" : ["SPARK2_JOBHISTORYSERVER-START", "APP_TIMELINE_SERVER-START"], "ATLAS_SERVER-START": ["KAFKA_BROKER-START", "LOGSEARCH_SOLR-START", "HBASE_MASTER-START", "HBASE_REGIONSERVER-START"] },
