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/14da3cad Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14da3cad Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14da3cad Branch: refs/heads/branch-feature-AMBARI-21450 Commit: 14da3cad8a06f2651f1a3695bca50b5c88959e9a Parents: 83e6f06 Author: Dmytro Sen <[email protected]> Authored: Thu Aug 3 14:50:59 2017 +0300 Committer: Dmytro Sen <[email protected]> Committed: Thu Aug 3 14:50:59 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 +- .../stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py | 2 +- .../ambari/server/controller/AmbariManagementControllerTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/14da3cad/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 36cfb0f..f557472 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 @@ -3742,7 +3742,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/14da3cad/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 20e86f7..3c01059 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 @@ -167,7 +167,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/14da3cad/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 3e712b3..490fd39 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 @@ -45,7 +45,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/14da3cad/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/14da3cad/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 2b8bf93..6b34473 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 @@ -10229,7 +10229,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);
