Repository: ambari Updated Branches: refs/heads/branch-3.0-perf 5ae98dbeb -> dddce4dd3
AMBARI-22217. Deploy fails due to PU code related issues (post-merge) (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dddce4dd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dddce4dd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dddce4dd Branch: refs/heads/branch-3.0-perf Commit: dddce4dd39eef43c804a611c6623a36a9fe2dc06 Parents: 5ae98db Author: Andrew Onishuk <[email protected]> Authored: Tue Oct 17 10:59:12 2017 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Tue Oct 17 10:59:12 2017 +0300 ---------------------------------------------------------------------- .../src/main/python/ambari_agent/AlertSchedulerHandler.py | 1 - .../src/main/python/ambari_agent/CustomServiceOrchestrator.py | 5 +++++ ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py | 2 +- .../resource_management/libraries/functions/conf_select.py | 2 +- .../resource_management/libraries/functions/stack_features.py | 2 +- .../resource_management/libraries/functions/stack_select.py | 2 +- .../resource_management/libraries/functions/stack_tools.py | 2 +- .../main/python/resource_management/libraries/script/script.py | 2 +- .../ATLAS/0.7.0.3.0/package/scripts/status_params.py | 2 +- .../common-services/KAFKA/0.10.0.3.0/package/scripts/params.py | 2 +- .../KNOX/0.5.0.3.0/package/scripts/status_params.py | 2 +- .../OOZIE/4.2.0.3.0/package/scripts/status_params.py | 2 +- .../common-services/RANGER/1.0.0.3.0/package/scripts/params.py | 2 +- .../RANGER/1.0.0.3.0/package/scripts/status_params.py | 2 +- .../RANGER_KMS/1.0.0.3.0/package/scripts/params.py | 2 +- .../RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py | 2 +- .../SQOOP/1.4.4.3.0/package/scripts/params_linux.py | 2 +- .../STORM/1.0.1.3.0/package/scripts/status_params.py | 2 +- .../common-services/SUPERSET/0.15.0/package/scripts/params.py | 2 +- .../YARN/2.1.0.2.0/package/scripts/status_params.py | 3 ++- .../src/test/python/custom_actions/test_ru_execute_tasks.py | 4 ++-- .../src/test/python/custom_actions/test_ru_set_all.py | 6 +++--- 22 files changed, 29 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py b/ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py index ac78a5d..3e2a55b 100644 --- a/ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py +++ b/ambari-agent/src/main/python/ambari_agent/AlertSchedulerHandler.py @@ -253,7 +253,6 @@ class AlertSchedulerHandler(): # cache the cluster and cluster hash after loading the JSON if clusterName != '' and clusterHash is not None: logger.info('[AlertScheduler] Caching cluster {0} with alert hash {1}'.format(clusterName, clusterHash)) - self._cluster_hashes[clusterName] = clusterHash for definition in command_json['alertDefinitions']: alert = self.__json_to_callable(clusterName, hostName, publicHostName, Utils.get_mutable_copy(definition)) http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py index 2270dce..8813243 100644 --- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py +++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py @@ -472,6 +472,11 @@ class CustomServiceOrchestrator(): if service_name is not None and service_name != 'null': command_dict['serviceLevelParams'] = metadata_cache.serviceLevelParams[service_name] + host_repos = host_level_params_cache.hostRepositories + if component_name in host_repos.componentRepos: + repo_version_id = host_repos.componentRepos[component_name] + command_dict['repositoryFile'] = host_repos.commandRepos[str(repo_version_id)] + component_dict = self.topology_cache.get_component_info_by_key(cluster_id, service_name, component_name) if component_dict is not None: command_dict.update({ http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py b/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py index c0325ff..2d9e5cc 100644 --- a/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py +++ b/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py @@ -71,7 +71,7 @@ class HeartbeatThread(threading.Thread): (Constants.METADATA_REQUEST_ENDPOINT, initializer_module.metadata_cache, self.metadata_events_listener), (Constants.CONFIGURATIONS_REQUEST_ENDPOINT, initializer_module.configurations_cache, self.configuration_events_listener), (Constants.HOST_LEVEL_PARAMS_TOPIC_ENPOINT, initializer_module.host_level_params_cache, self.host_level_params_events_listener), - #(Constants.ALERTS_DEFINITIONS_REQUEST_ENDPOINT, initializer_module.alert_definitions_cache, self.alert_definitions_events_listener) + (Constants.ALERTS_DEFINITIONS_REQUEST_ENDPOINT, initializer_module.alert_definitions_cache, self.alert_definitions_events_listener) ] self.responseId = 0 self.file_cache = initializer_module.file_cache http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py index a6a05bf..26fbaaf 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py @@ -56,7 +56,7 @@ def get_package_dirs(): Get package dir mappings :return: """ - stack_name = default("/hostLevelParams/stack_name", None) + stack_name = default("/clusterLevelParams/stack_name", None) if stack_name is None: raise Fail("The stack name is not present in the command. Packages for conf-select tool cannot be loaded.") http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-common/src/main/python/resource_management/libraries/functions/stack_features.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/stack_features.py b/ambari-common/src/main/python/resource_management/libraries/functions/stack_features.py index 26b0af0..da4f1c0 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/stack_features.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/stack_features.py @@ -44,7 +44,7 @@ def check_stack_feature(stack_feature, stack_version): from resource_management.libraries.functions.default import default from resource_management.libraries.functions.version import compare_versions - stack_name = default("/hostLevelParams/stack_name", None) + stack_name = default("/clusterLevelParams/stack_name", None) if stack_name is None: Logger.warning("Cannot find the stack name in the command. Stack features cannot be loaded") return False http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py b/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py index a76a6e3..5722a4d 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py @@ -174,7 +174,7 @@ def get_packages(scope, service_name = None, component_name = None): component_name = config['role'] - stack_name = default("/hostLevelParams/stack_name", None) + stack_name = default("/clusterLevelParams/stack_name", None) if stack_name is None: raise Fail("The stack name is not present in the command. Packages for stack-select tool cannot be loaded.") http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py b/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py index d9233a3..eecfce4 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/stack_tools.py @@ -41,7 +41,7 @@ def get_stack_tool(name): """ from resource_management.libraries.functions.default import default - stack_name = default("/hostLevelParams/stack_name", None) + stack_name = default("/clusterLevelParams/stack_name", None) if stack_name is None: Logger.warning("Cannot find the stack name in the command. Stack tools cannot be loaded") return None, None, None http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-common/src/main/python/resource_management/libraries/script/script.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py index 9a046b9..e507b0a 100644 --- a/ambari-common/src/main/python/resource_management/libraries/script/script.py +++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py @@ -247,7 +247,7 @@ class Script(object): # if repository_version_id is passed, pass it back with the version from resource_management.libraries.functions.default import default - repo_version_id = default("/roleParams/repository_version_id", None) + repo_version_id = default("/repositoryFile/repoVersionId", None) if repo_version_id: self.put_structured_out({"repository_version_id": repo_version_id}) else: http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/status_params.py index 852a9cb..6590478 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/status_params.py @@ -55,6 +55,6 @@ security_enabled = default("/configurations/cluster-env/security_enabled", None) kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None)) tmp_dir = Script.get_tmp_dir() -stack_name = default("/hostLevelParams/stack_name", None) +stack_name = default("/clusterLevelParams/stack_name", None) hadoop_conf_dir = conf_select.get_hadoop_conf_dir() hadoop_bin_dir = stack_select.get_hadoop_dir("bin") http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py index 869c329..937c4b5 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py @@ -41,7 +41,7 @@ from resource_management.libraries.functions.setup_ranger_plugin_xml import get_ config = Script.get_config() tmp_dir = Script.get_tmp_dir() stack_root = Script.get_stack_root() -stack_name = default("/hostLevelParams/stack_name", None) +stack_name = default("/clusterLevelParams/stack_name", None) retryAble = default("/commandParams/command_retry_enabled", False) # Version being upgraded/downgraded to http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py index 3cbd920..699d9a8 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py @@ -56,4 +56,4 @@ else: kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None)) temp_dir = Script.get_tmp_dir() -stack_name = default("/hostLevelParams/stack_name", None) \ No newline at end of file +stack_name = default("/clusterLevelParams/stack_name", None) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py index ce990cf..c559d10 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py @@ -62,4 +62,4 @@ else: oozie_user = config['configurations']['oozie-env']['oozie_user'] hostname = config["hostname"] -stack_name = default("/hostLevelParams/stack_name", None) \ No newline at end of file +stack_name = default("/clusterLevelParams/stack_name", None) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py index b88f1a4..1e968a3 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py @@ -45,7 +45,7 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() stack_root = Script.get_stack_root() -stack_name = default("/hostLevelParams/stack_name", None) +stack_name = default("/clusterLevelParams/stack_name", None) version = default("/commandParams/version", None) stack_version_unformatted = config['hostLevelParams']['stack_version'] http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py index 842430b..b71f8bd 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py @@ -31,7 +31,7 @@ tmp_dir = Script.get_tmp_dir() upgrade_marker_file = format("{tmp_dir}/rangeradmin_ru.inprogress") ranger_pid_dir = config['configurations']['ranger-env']['ranger_pid_dir'] tagsync_pid_file = format('{ranger_pid_dir}/tagsync.pid') -stack_name = default("/hostLevelParams/stack_name", None) +stack_name = default("/clusterLevelParams/stack_name", None) stack_version_unformatted = config['hostLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) ranger_admin_pid_file = format('{ranger_pid_dir}/rangeradmin.pid') http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py index da8eb8c..156db10 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py @@ -38,7 +38,7 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() stack_root = Script.get_stack_root() -stack_name = default("/hostLevelParams/stack_name", None) +stack_name = default("/clusterLevelParams/stack_name", None) version = default("/commandParams/version", None) upgrade_direction = default("/commandParams/upgrade_direction", None) http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py index 34d0082..f9e903d 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py @@ -28,7 +28,7 @@ from resource_management.libraries.functions import StackFeature config = Script.get_config() tmp_dir = Script.get_tmp_dir() -stack_name = default("/hostLevelParams/stack_name", None) +stack_name = default("/clusterLevelParams/stack_name", None) stack_version_unformatted = config['hostLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) stack_supports_pid = stack_version_formatted and check_stack_feature(StackFeature.RANGER_KMS_PID_SUPPORT, stack_version_formatted) http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py index 400c87c..51ada4e 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py @@ -47,7 +47,7 @@ cluster_name = config['clusterName'] ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0] -stack_name = default("/hostLevelParams/stack_name", None) +stack_name = default("/clusterLevelParams/stack_name", None) stack_version_unformatted = config['hostLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/status_params.py index d84b095..7d97203 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/status_params.py @@ -80,4 +80,4 @@ else: storm_ui_principal = default('/configurations/storm-env/storm_ui_principal_name', None) storm_ui_keytab = default('/configurations/storm-env/storm_ui_keytab', None) -stack_name = default("/hostLevelParams/stack_name", None) \ No newline at end of file +stack_name = default("/clusterLevelParams/stack_name", None) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/package/scripts/params.py index b38d643..df0d9fd 100644 --- a/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SUPERSET/0.15.0/package/scripts/params.py @@ -32,7 +32,7 @@ import status_params # server configurations config = Script.get_config() stack_root = Script.get_stack_root() -stack_name = default("/hostLevelParams/stack_name", None) +stack_name = default("/clusterLevelParams/stack_name", None) user_group = config['configurations']['cluster-env']['user_group'] # stack version http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/status_params.py index 506d9de..6a8e99a 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/status_params.py @@ -19,6 +19,7 @@ limitations under the License. """ from resource_management.libraries.script.script import Script from resource_management.libraries import functions +from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import format from resource_management.libraries.functions.default import default from ambari_commons import OSCheck @@ -52,7 +53,7 @@ else: yarn_historyserver_pid_file = format("{yarn_pid_dir}/yarn-{yarn_user}-timelineserver.pid") # *-historyserver.pid is deprecated mapred_historyserver_pid_file = format("{mapred_pid_dir}/mapred-{mapred_user}-historyserver.pid") - hadoop_conf_dir = functions.conf_select.get_hadoop_conf_dir() + hadoop_conf_dir = conf_select.get_hadoop_conf_dir() hostname = config['agentLevelParams']['hostname'] kinit_path_local = functions.get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None)) http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py b/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py index 0d12a91..0c855fc 100644 --- a/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py +++ b/ambari-server/src/test/python/custom_actions/test_ru_execute_tasks.py @@ -116,7 +116,7 @@ class TestRUExecuteTasks(RMFTestCase): call_mock.side_effect = fake_call # echo the command # Ensure that the json file was actually read. - stack_name = default("/hostLevelParams/stack_name", None) + stack_name = default("/clusterLevelParams/stack_name", None) stack_version = default("/hostLevelParams/stack_version", None) service_package_folder = default('/roleParams/service_package_folder', None) @@ -164,7 +164,7 @@ class TestRUExecuteTasks(RMFTestCase): call_mock.side_effect = fake_call # echo the command # Ensure that the json file was actually read. - stack_name = default("/hostLevelParams/stack_name", None) + stack_name = default("/clusterLevelParams/stack_name", None) stack_version = default("/hostLevelParams/stack_version", None) service_package_folder = default('/roleParams/service_package_folder', None) http://git-wip-us.apache.org/repos/asf/ambari/blob/dddce4dd/ambari-server/src/test/python/custom_actions/test_ru_set_all.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/custom_actions/test_ru_set_all.py b/ambari-server/src/test/python/custom_actions/test_ru_set_all.py index de83f7e..fb6ec20 100644 --- a/ambari-server/src/test/python/custom_actions/test_ru_set_all.py +++ b/ambari-server/src/test/python/custom_actions/test_ru_set_all.py @@ -89,7 +89,7 @@ class TestRUSetAll(RMFTestCase): exists_mock.return_value = True # Ensure that the json file was actually read. - stack_name = default("/hostLevelParams/stack_name", None) + stack_name = default("/clusterLevelParams/stack_name", None) stack_version = default("/hostLevelParams/stack_version", None) service_package_folder = default('/roleParams/service_package_folder', None) @@ -130,7 +130,7 @@ class TestRUSetAll(RMFTestCase): exists_mock.return_value = True # Ensure that the json file was actually read. - stack_name = default("/hostLevelParams/stack_name", None) + stack_name = default("/clusterLevelParams/stack_name", None) stack_version = default("/hostLevelParams/stack_version", None) service_package_folder = default('/roleParams/service_package_folder', None) @@ -181,7 +181,7 @@ class TestRUSetAll(RMFTestCase): call_mock.side_effect = hdp_select_call # Ensure that the json file was actually read. - stack_name = default("/hostLevelParams/stack_name", None) + stack_name = default("/clusterLevelParams/stack_name", None) stack_version = default("/hostLevelParams/stack_version", None) service_package_folder = default('/roleParams/service_package_folder', None)
