You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2017/09/15 11:46:04 UTC
ambari git commit: AMBARI-21945. Refresh Include/Exclude breaks
parallel operations and can"t be turned off.(dsen via vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 f28b9f17e -> d327aecee
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/d327aece
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d327aece
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d327aece
Branch: refs/heads/branch-2.6
Commit: d327aecee173f0ef88d4e3575d56fccbc5e8fcb5
Parents: f28b9f1
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri Sep 15 14:45:08 2017 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri Sep 15 14:45:08 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/d327aece/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 c78d88d..89dc126 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
@@ -3684,7 +3684,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));
@@ -3705,7 +3704,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/d327aece/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 cf4c98f..e51bb0a 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
@@ -9388,6 +9388,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());