AMBARI-21621 Do not call refreshnodes command after deleting a slave (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4a122a22 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a122a22 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a122a22 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: 4a122a220d28da86da7cafdf89d00b5c09ae4193 Parents: a45e8f4 Author: Dmytro Sen <d...@apache.org> Authored: Thu Aug 3 14:46:51 2017 +0300 Committer: Dmytro Sen <d...@apache.org> Committed: Thu Aug 3 14:46:51 2017 +0300 ---------------------------------------------------------------------- .../ambari/server/controller/AmbariManagementControllerImpl.java | 2 +- .../common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py | 2 +- .../HDFS/2.1.0.2.0/package/scripts/params_windows.py | 2 +- .../common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py | 2 +- .../HDFS/3.0.0.3.0/package/scripts/params_windows.py | 2 +- .../stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py | 2 +- .../ambari/server/controller/AmbariManagementControllerTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4a122a22/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java index 3016027..9f0fa34 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java @@ -3725,7 +3725,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle requestProperties.put("context", "Update Include and Exclude Files for " + serviceMasterMap.keySet().toString()); requestProperties.put("exclusive", "true"); HashMap<String, String> params = new HashMap<>(); - params.put(AmbariCustomCommandExecutionHelper.UPDATE_FILES_ONLY, "false"); + params.put(AmbariCustomCommandExecutionHelper.UPDATE_FILES_ONLY, String.valueOf(isDecommission)); for (String masterName : masterSlaveHostsMap.keySet()) { if (!isDecommission) { http://git-wip-us.apache.org/repos/asf/ambari/blob/4a122a22/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py index c9df2b9..256211f 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py @@ -169,7 +169,7 @@ include_file_path = default("/configurations/hdfs-site/dfs.hosts", None) hdfs_include_file = None manage_include_files = default("/configurations/hdfs-site/manage.include.files", False) if include_file_path and manage_include_files: - hdfs_include_file = list(set(slave_hosts) - set(hdfs_exclude_file)) + hdfs_include_file = slave_hosts update_files_only = default("/commandParams/update_files_only",False) command_phase = default("/commandParams/phase","") http://git-wip-us.apache.org/repos/asf/ambari/blob/4a122a22/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py index b3ac578..d01c83a 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_windows.py @@ -48,7 +48,7 @@ hdfs_include_file = None manage_include_files = default("/configurations/hdfs-site/manage.include.files", False) if include_file_path and manage_include_files: slave_hosts = default("/clusterHostInfo/slave_hosts", []) - hdfs_include_file = list(set(slave_hosts) - set(hdfs_exclude_file)) + hdfs_include_file = slave_hosts update_files_only = default("/commandParams/update_files_only",False) # HDFS High Availability properties dfs_ha_enabled = False http://git-wip-us.apache.org/repos/asf/ambari/blob/4a122a22/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py index 1581c2a..de735f4 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py @@ -163,7 +163,7 @@ include_file_path = default("/configurations/hdfs-site/dfs.hosts", None) hdfs_include_file = None manage_include_files = default("/configurations/hdfs-site/manage.include.files", False) if include_file_path and manage_include_files: - hdfs_include_file = list(set(slave_hosts) - set(hdfs_exclude_file)) + hdfs_include_file = slave_hosts update_files_only = default("/commandParams/update_files_only", False) command_phase = default("/commandParams/phase","") http://git-wip-us.apache.org/repos/asf/ambari/blob/4a122a22/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_windows.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_windows.py index 6c492d8..9d35e5b 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_windows.py +++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_windows.py @@ -48,7 +48,7 @@ hdfs_include_file = None manage_include_files = default("/configurations/hdfs-site/manage.include.files", False) if include_file_path and manage_include_files: slave_hosts = default("/clusterHostInfo/slave_hosts", []) - hdfs_include_file = list(set(slave_hosts) - set(hdfs_exclude_file)) + hdfs_include_file = slave_hosts update_files_only = default("/commandParams/update_files_only",False) # HDFS High Availability properties dfs_ha_enabled = False http://git-wip-us.apache.org/repos/asf/ambari/blob/4a122a22/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py index 9cf163a..3a711c7 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py @@ -60,7 +60,7 @@ include_file_path = default("/configurations/hdfs-site/dfs.hosts", None) hdfs_include_file = None manage_include_files = default("/configurations/hdfs-site/manage.include.files", False) if include_file_path and manage_include_files: - hdfs_include_file = list(set(slave_hosts) - set(hdfs_exclude_file)) + hdfs_include_file = slave_hosts update_files_only = default("/commandParams/update_files_only",False) 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/4a122a22/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java index 5fb236b..bda9576 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java @@ -9392,7 +9392,7 @@ public class AmbariManagementControllerTest { Map<String, String> requestParams = StageUtils.getGson().fromJson(request.getInputs(), type); assertEquals(2, requestParams.size()); assertEquals("true", requestParams.get("multi_services_decom_request")); - assertEquals("false", requestParams.get("update_files_only")); + assertEquals("true", requestParams.get("update_files_only")); assertEquals(1, request.getResourceFilters().size()); RequestResourceFilter resourceFilter = request.getResourceFilters().get(0); assertEquals(resourceFilter.getServiceName(), hdfsService);
