Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8814F200B92 for ; Wed, 28 Sep 2016 12:02:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 86C31160AD4; Wed, 28 Sep 2016 10:02:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CDBA9160AB4 for ; Wed, 28 Sep 2016 12:02:02 +0200 (CEST) Received: (qmail 23745 invoked by uid 500); 28 Sep 2016 10:02:02 -0000 Mailing-List: contact commits-help@eagle.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.incubator.apache.org Delivered-To: mailing list commits@eagle.incubator.apache.org Received: (qmail 23718 invoked by uid 99); 28 Sep 2016 10:02:01 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2016 10:02:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 748AB1A02C3 for ; Wed, 28 Sep 2016 10:02:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 1T118k7AlJ01 for ; Wed, 28 Sep 2016 10:02:00 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id A2E415FB09 for ; Wed, 28 Sep 2016 10:01:59 +0000 (UTC) Received: (qmail 23676 invoked by uid 99); 28 Sep 2016 10:01:58 -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; Wed, 28 Sep 2016 10:01:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B0F74E0061; Wed, 28 Sep 2016 10:01:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: qingwzhao@apache.org To: commits@eagle.incubator.apache.org Message-Id: <6a11acc9a1b04dcbb2ed44f8789629b7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?incubator-eagle_git_commit=3A_=5BEAGLE-565=5D_Because_of?= =?utf-8?q?_the_=22type=22_field_when_has_subqueue_=2Cresponse_of_RM_REST_AP?= =?utf-8?q?I_doesn=E2=80=98t_match_the_SchedulerWrapper_object?= Date: Wed, 28 Sep 2016 10:01:58 +0000 (UTC) archived-at: Wed, 28 Sep 2016 10:02:03 -0000 Repository: incubator-eagle Updated Branches: refs/heads/master 50ddd604c -> d61d34698 [EAGLE-565] Because of the "type" field when has subqueue ,response of RM REST API doesn‘t match the SchedulerWrapper object EAGLE-565 Because of the "type" field when has subqueue ,response of RM REST API doesn‘t match the SchedulerWrapper object - Ignore and add comments on the "type" field in class Queue, in order to workaround YARN-4785 https://issues.apache.org/jira/browse/EAGLE-565 Author: chitin Closes #455 from chitin/master565. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/d61d3469 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/d61d3469 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/d61d3469 Branch: refs/heads/master Commit: d61d3469822dfae3a85d6b796d135f68d58dd0ba Parents: 50ddd60 Author: chitin Authored: Wed Sep 28 18:01:47 2016 +0800 Committer: Zhao, Qingwen Committed: Wed Sep 28 18:01:47 2016 +0800 ---------------------------------------------------------------------- .../eagle/hadoop/queue/model/scheduler/Queue.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/d61d3469/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queue.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queue.java b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queue.java index 550c9d5..8fa57e4 100644 --- a/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queue.java +++ b/eagle-jpm/eagle-hadoop-queue/src/main/java/org/apache/eagle/hadoop/queue/model/scheduler/Queue.java @@ -24,7 +24,7 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Queue { - private String type; + //private String type; workaround the YARN-4785,the field's value is based on the "type" field of SchedulerInfo.java, then its getter and setter function is never used. private double capacity; private double usedCapacity; private double maxCapacity; @@ -122,13 +122,13 @@ public class Queue { } - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } + // public String getType() { + // return type; + // } + // + // public void setType(String type) { + // this.type = type; + // } public ResourcesUsed getResourcesUsed() { return resourcesUsed;