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 46B1A200C24 for ; Thu, 19 Jan 2017 01:23:43 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4545C160B44; Thu, 19 Jan 2017 00:23:43 +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 8F75A160B43 for ; Thu, 19 Jan 2017 01:23:42 +0100 (CET) Received: (qmail 18767 invoked by uid 500); 19 Jan 2017 00:23:37 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 17701 invoked by uid 99); 19 Jan 2017 00:23:37 -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, 19 Jan 2017 00:23:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 024FBF402F; Thu, 19 Jan 2017 00:23:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jhung@apache.org To: common-commits@hadoop.apache.org Date: Thu, 19 Jan 2017 00:23:51 -0000 Message-Id: <467a5150fc994b00834362e1fa859f5f@git.apache.org> In-Reply-To: <51bb37b19be842bf878fb0e1cba339c3@git.apache.org> References: <51bb37b19be842bf878fb0e1cba339c3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/30] hadoop git commit: YARN-6071. Fix incompatible API change on AM-RM protocol due to YARN-3866 (trunk only) (Contributed by Wangda Tan via Daniel Templeton) archived-at: Thu, 19 Jan 2017 00:23:43 -0000 YARN-6071. Fix incompatible API change on AM-RM protocol due to YARN-3866 (trunk only) (Contributed by Wangda Tan via Daniel Templeton) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/695f110f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/695f110f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/695f110f Branch: refs/heads/YARN-5734 Commit: 695f110f937b35e92d635b9e93740d3b5af179a6 Parents: 78b487b Author: Daniel Templeton Authored: Tue Jan 17 12:55:47 2017 -0800 Committer: Daniel Templeton Committed: Tue Jan 17 12:55:47 2017 -0800 ---------------------------------------------------------------------- .../apache/hadoop/yarn/api/protocolrecords/AllocateRequest.java | 4 ++-- .../hadoop-yarn-api/src/main/proto/yarn_service_protos.proto | 2 +- .../org/apache/hadoop/yarn/server/resourcemanager/MockAM.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/695f110f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateRequest.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateRequest.java index 0786794..ae0891e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateRequest.java @@ -77,8 +77,8 @@ public abstract class AllocateRequest { public static AllocateRequest newInstance(int responseID, float appProgress, List resourceAsk, List containersToBeReleased, - ResourceBlacklistRequest resourceBlacklistRequest, - List updateRequests) { + List updateRequests, + ResourceBlacklistRequest resourceBlacklistRequest) { return AllocateRequest.newBuilder().responseId(responseID) .progress(appProgress).askList(resourceAsk) .releaseList(containersToBeReleased) http://git-wip-us.apache.org/repos/asf/hadoop/blob/695f110f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto index aed1580..df3c852 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto @@ -109,11 +109,11 @@ message AllocateResponseProto { optional int32 num_cluster_nodes = 7; optional PreemptionMessageProto preempt = 8; repeated NMTokenProto nm_tokens = 9; - repeated UpdatedContainerProto updated_containers = 10; optional hadoop.common.TokenProto am_rm_token = 12; optional PriorityProto application_priority = 13; optional string collector_addr = 14; repeated UpdateContainerErrorProto update_errors = 15; + repeated UpdatedContainerProto updated_containers = 16; } enum SchedulerResourceTypes { http://git-wip-us.apache.org/repos/asf/hadoop/blob/695f110f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java index fbeca7b..2451c1e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java @@ -247,14 +247,14 @@ public class MockAM { public AllocateResponse sendContainerResizingRequest( List updateRequests) throws Exception { final AllocateRequest req = AllocateRequest.newInstance(0, 0F, null, null, - null, updateRequests); + updateRequests, null); return allocate(req); } public AllocateResponse sendContainerUpdateRequest( List updateRequests) throws Exception { final AllocateRequest req = AllocateRequest.newInstance(0, 0F, null, null, - null, updateRequests); + updateRequests, null); return allocate(req); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org