Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6071. Fix incompatible API change on AM-RM protocol due to YARN-3866 (trunk only) 

(Contributed by Wangda Tan via Daniel Templeton)
This commit is contained in:
Daniel Templeton 2017-01-17 12:55:47 -08:00
parent 78b487bde1
commit 695f110f93
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateRequest.java
View File

@ -77,8 +77,8 @@ public abstract class AllocateRequest {
public static AllocateRequest newInstance(int responseID, float appProgress, public static AllocateRequest newInstance(int responseID, float appProgress,
List<ResourceRequest> resourceAsk, List<ResourceRequest> resourceAsk,
List<ContainerId> containersToBeReleased, List<ContainerId> containersToBeReleased,
ResourceBlacklistRequest resourceBlacklistRequest, List<UpdateContainerRequest> updateRequests,
List<UpdateContainerRequest> updateRequests) { ResourceBlacklistRequest resourceBlacklistRequest) {
return AllocateRequest.newBuilder().responseId(responseID) return AllocateRequest.newBuilder().responseId(responseID)
.progress(appProgress).askList(resourceAsk) .progress(appProgress).askList(resourceAsk)
.releaseList(containersToBeReleased) .releaseList(containersToBeReleased)

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto
View File

@ -109,11 +109,11 @@ message AllocateResponseProto {
optional int32 num_cluster_nodes = 7; optional int32 num_cluster_nodes = 7;
optional PreemptionMessageProto preempt = 8; optional PreemptionMessageProto preempt = 8;
repeated NMTokenProto nm_tokens = 9; repeated NMTokenProto nm_tokens = 9;
repeated UpdatedContainerProto updated_containers = 10;
optional hadoop.common.TokenProto am_rm_token = 12; optional hadoop.common.TokenProto am_rm_token = 12;
optional PriorityProto application_priority = 13; optional PriorityProto application_priority = 13;
optional string collector_addr = 14; optional string collector_addr = 14;
repeated UpdateContainerErrorProto update_errors = 15; repeated UpdateContainerErrorProto update_errors = 15;
repeated UpdatedContainerProto updated_containers = 16;
} }
enum SchedulerResourceTypes { enum SchedulerResourceTypes {

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java
View File

@ -247,14 +247,14 @@ public class MockAM {
public AllocateResponse sendContainerResizingRequest( public AllocateResponse sendContainerResizingRequest(
List<UpdateContainerRequest> updateRequests) throws Exception { List<UpdateContainerRequest> updateRequests) throws Exception {
final AllocateRequest req = AllocateRequest.newInstance(0, 0F, null, null, final AllocateRequest req = AllocateRequest.newInstance(0, 0F, null, null,
null, updateRequests); updateRequests, null);
return allocate(req); return allocate(req);
} }
public AllocateResponse sendContainerUpdateRequest( public AllocateResponse sendContainerUpdateRequest(
List<UpdateContainerRequest> updateRequests) throws Exception { List<UpdateContainerRequest> updateRequests) throws Exception {
final AllocateRequest req = AllocateRequest.newInstance(0, 0F, null, null, final AllocateRequest req = AllocateRequest.newInstance(0, 0F, null, null,
null, updateRequests); updateRequests, null);
return allocate(req); return allocate(req);
} }