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 <templ...@apache.org> Authored: Tue Jan 17 12:55:47 2017 -0800 Committer: Daniel Templeton <templ...@apache.org> 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<ResourceRequest> resourceAsk, List<ContainerId> containersToBeReleased, - ResourceBlacklistRequest resourceBlacklistRequest, - List<UpdateContainerRequest> updateRequests) { + List<UpdateContainerRequest> 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<UpdateContainerRequest> updateRequests) throws Exception { final AllocateRequest req = AllocateRequest.newInstance(0, 0F, null, null, - null, updateRequests); + updateRequests, null); return allocate(req); } public AllocateResponse sendContainerUpdateRequest( List<UpdateContainerRequest> 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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
