Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-20859 b3f7d9e42 -> 7460cebf9
AMBARI-20980. RU: RESTART SPARK2/SPARK2_CLIENT failed (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e2dd63b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e2dd63b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e2dd63b Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 7e2dd63b7a3b7509a28b12641de87122eda0e33e Parents: 3edbc2c Author: Lisnichenko Dmitro <[email protected]> Authored: Thu May 11 17:31:58 2017 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Thu May 11 17:31:58 2017 +0300 ---------------------------------------------------------------------- .../common-services/SPARK/1.2.1/package/scripts/params.py | 2 +- .../common-services/SPARK/2.2.0/package/scripts/params.py | 2 +- .../common-services/SPARK2/2.0.0/package/scripts/params.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7e2dd63b/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 6a59caf..42396bd 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 @@ -211,7 +211,7 @@ dfs_type = default("/commandParams/dfs_type", "") # livy is only supported from HDP 2.5 has_livyserver = False -if stack_version_formatted and check_stack_feature(StackFeature.SPARK_LIVY, stack_version_formatted): +if stack_version_formatted and check_stack_feature(StackFeature.SPARK_LIVY, stack_version_formatted) and "livy-env" in config['configurations']: livy_component_directory = Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "LIVY_SERVER") livy_conf = format("{stack_root}/current/{livy_component_directory}/conf") livy_log_dir = config['configurations']['livy-env']['livy_log_dir'] http://git-wip-us.apache.org/repos/asf/ambari/blob/7e2dd63b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py index e60cab5..1d36a75 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py @@ -200,7 +200,7 @@ dfs_type = default("/commandParams/dfs_type", "") # livy for spark2 is only supported from HDP 2.6 has_livyserver = False -if stack_version_formatted and check_stack_feature(StackFeature.SPARK_LIVY, stack_version_formatted): +if stack_version_formatted and check_stack_feature(StackFeature.SPARK_LIVY, stack_version_formatted) and "livy-env" in config['configurations']: livy_component_directory = Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "LIVY_SERVER") livy_conf = format("{stack_root}/current/{livy_component_directory}/conf") livy_log_dir = config['configurations']['livy-env']['livy_log_dir'] http://git-wip-us.apache.org/repos/asf/ambari/blob/7e2dd63b/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 4ed0718..1df3f2f 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 @@ -198,7 +198,7 @@ dfs_type = default("/commandParams/dfs_type", "") # livy for spark2 is only supported from HDP 2.6 has_livyserver = False -if stack_version_formatted and check_stack_feature(StackFeature.SPARK_LIVY2, stack_version_formatted): +if stack_version_formatted and check_stack_feature(StackFeature.SPARK_LIVY2, stack_version_formatted) and "livy2-env" in config['configurations']: livy2_component_directory = Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "LIVY2_SERVER") livy2_conf = format("{stack_root}/current/{livy2_component_directory}/conf") livy2_log_dir = config['configurations']['livy2-env']['livy2_log_dir']
