SIDER-799 CancelSingleRequest
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/83388984 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/83388984 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/83388984 Branch: refs/heads/feature/SLIDER-799-AM-managed-relax Commit: 833889843cdbac907bc1a264d085c309e3be3c7a Parents: 6d955af Author: Steve Loughran <[email protected]> Authored: Tue Mar 17 11:23:14 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Tue Mar 17 11:23:14 2015 +0000 ---------------------------------------------------------------------- .../operations/CancelSingleRequest.java | 27 +++++--------------- 1 file changed, 7 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/83388984/slider-core/src/main/java/org/apache/slider/server/appmaster/operations/CancelSingleRequest.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/operations/CancelSingleRequest.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/operations/CancelSingleRequest.java index e4ccb10..3bb3b09 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/operations/CancelSingleRequest.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/operations/CancelSingleRequest.java @@ -18,41 +18,28 @@ package org.apache.slider.server.appmaster.operations; -import org.apache.hadoop.yarn.api.records.Priority; -import org.apache.slider.server.appmaster.state.ContainerPriority; +import org.apache.hadoop.yarn.client.api.AMRMClient; /** * Cancel a container request */ public class CancelSingleRequest extends AbstractRMOperation { - private final Priority priority1; - private final Priority priority2; - private final int count; + private final AMRMClient.ContainerRequest request; - public CancelSingleRequest(Priority priority1, Priority priority2, int count) { - this.priority1 = priority1; - this.priority2 = priority2; - this.count = count; + public CancelSingleRequest(AMRMClient.ContainerRequest request) { + this.request = request; } @Override public void execute(RMOperationHandlerActions handler) { - handler.cancelContainerRequests(priority1, priority2, count); + handler.cancelSingleRequest(request); } @Override public String toString() { - return "release " + count - + " requests for " + ContainerPriority.toString(priority1) - + " and " + ContainerPriority.toString(priority2); + return "cancel single request for container at " + request.getPriority().toString(); } - /** - * Get the number to release - * @return the number of containers to release - */ - public int getCount() { - return count; - } + }
