Repository: ambari Updated Branches: refs/heads/trunk b46cc4f85 -> e53cc68d4
AMBARI-21945. Refresh Include/Exclude breaks parallel operations and can"t be turned off.(dsen via vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e53cc68d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e53cc68d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e53cc68d Branch: refs/heads/trunk Commit: e53cc68d48d3c2f8a10b4f66d802a5ecf7efd5a4 Parents: b46cc4f Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Fri Sep 15 14:49:02 2017 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Fri Sep 15 14:49:02 2017 +0300 ---------------------------------------------------------------------- .../ambari/server/controller/AmbariManagementControllerImpl.java | 3 +-- .../ambari/server/controller/AmbariManagementControllerTest.java | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e53cc68d/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 34744eb..3289d18 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 @@ -3723,7 +3723,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle LOG.debug("Refresh include/exclude files action will be executed for " + serviceMasterMap); HashMap<String, String> requestProperties = new HashMap<>(); requestProperties.put("context", "Update Include/Exclude Files for " + serviceMasterMap.keySet().toString()); - requestProperties.put("exclusive", "true"); HashMap<String, String> params = new HashMap<>(); params.put(AmbariCustomCommandExecutionHelper.UPDATE_FILES_ONLY, String.valueOf(isDecommission)); @@ -3744,7 +3743,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle //Create request for command ExecuteActionRequest actionRequest = new ExecuteActionRequest( clusterName, AmbariCustomCommandExecutionHelper.DECOMMISSION_COMMAND_NAME, null, - resourceFilters, null, params, true); + resourceFilters, null, params, false); //Send action createAction(actionRequest, requestProperties); } http://git-wip-us.apache.org/repos/asf/ambari/blob/e53cc68d/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 dea4870..07ba786 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 @@ -9387,6 +9387,7 @@ public class AmbariManagementControllerTest { List<Long> requestIDs = actionDB.getRequestsByStatus(null, 1, false); Request request = actionDB.getRequest(requestIDs.get(0)); assertEquals("Update Include/Exclude Files for [HDFS]", request.getRequestContext()); + assertEquals(false, request.isExclusive()); Type type = new TypeToken<Map<String, String>>(){}.getType(); Map<String, String> requestParams = StageUtils.getGson().fromJson(request.getInputs(), type); assertEquals(2, requestParams.size());
