YARN-4825. Remove redundant code in ClientRMService::listReservations. (subru via asuresh)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d82e797b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d82e797b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d82e797b Branch: refs/heads/HDFS-7240 Commit: d82e797b652f248e238bdf1818e6b4a5b91cea7a Parents: b1394d6 Author: Arun Suresh <asur...@apache.org> Authored: Thu Mar 24 09:59:55 2016 -0700 Committer: Arun Suresh <asur...@apache.org> Committed: Thu Mar 24 09:59:55 2016 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/server/resourcemanager/ClientRMService.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d82e797b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index ba1edf9..b7eb5f1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -1359,20 +1359,13 @@ public class ClientRMService extends AbstractService implements checkReservationACLs(requestInfo.getQueue(), AuditConstants.LIST_RESERVATION_REQUEST, reservationId); - ReservationId requestedId = null; - if (requestInfo.getReservationId() != null - && !requestInfo.getReservationId().isEmpty()) { - requestedId = ReservationId.parseReservationId(requestInfo - .getReservationId()); - } - long startTime = Math.max(requestInfo.getStartTime(), 0); long endTime = requestInfo.getEndTime() <= -1? Long.MAX_VALUE : requestInfo .getEndTime(); Set<ReservationAllocation> reservations; - reservations = plan.getReservations(requestedId, new ReservationInterval( + reservations = plan.getReservations(reservationId, new ReservationInterval( startTime, endTime)); List<ReservationAllocationState> info =
