Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6233A199D3 for ; Thu, 24 Mar 2016 17:00:56 +0000 (UTC) Received: (qmail 87465 invoked by uid 500); 24 Mar 2016 17:00:55 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 87403 invoked by uid 500); 24 Mar 2016 17:00:55 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 87394 invoked by uid 99); 24 Mar 2016 17:00:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Mar 2016 17:00:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 52D79DFBA0; Thu, 24 Mar 2016 17:00:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: asuresh@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-4825. Remove redundant code in ClientRMService::listReservations. (subru via asuresh) Date: Thu, 24 Mar 2016 17:00:55 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk b1394d630 -> d82e797b6 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/trunk Commit: d82e797b652f248e238bdf1818e6b4a5b91cea7a Parents: b1394d6 Author: Arun Suresh Authored: Thu Mar 24 09:59:55 2016 -0700 Committer: Arun Suresh 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 reservations; - reservations = plan.getReservations(requestedId, new ReservationInterval( + reservations = plan.getReservations(reservationId, new ReservationInterval( startTime, endTime)); List info =