big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-9921. Issue in PlacementConstraint when YARN Service AM retries allocation on component failure. Contributed by Tarun Parimi

Browse Source
This commit is contained in:
Zhankun Tang 2019-10-24 10:05:00 +08:00
parent 1d5d7d0989
commit fd84ca5161
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/SchedulingRequestPBImpl.java
View File

@ -277,8 +277,27 @@ public boolean equals(Object other) {
if (other == null) {
return false;
}
if (other.getClass().isAssignableFrom(this.getClass())) {
return this.getProto().equals(this.getClass().cast(other).getProto());
if (other instanceof SchedulingRequest) {
if (this == other) {
return true;
}
SchedulingRequest that = (SchedulingRequest) other;
if (getAllocationRequestId() != that.getAllocationRequestId()) {
return false;
}
if (!getAllocationTags().equals(that.getAllocationTags())) {
return false;
}
if (!getPriority().equals(that.getPriority())) {
return false;
}
if(!getExecutionType().equals(that.getExecutionType())) {
return false;
}
if(!getResourceSizing().equals(that.getResourceSizing())) {
return false;
}
return getPlacementConstraint().equals(that.getPlacementConstraint());
}
return false;
}

16
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/placement/TestSingleConstraintAppPlacementAllocator.java
View File

@ -226,6 +226,22 @@ public void testSchedulingRequestUpdate() {
schedulingRequest.getResourceSizing().setNumAllocations(10);
allocator.updatePendingAsk(schedulerRequestKey, schedulingRequest, false);
// Update allocator with a newly constructed scheduling request different at
// #allocations, should succeeded.
SchedulingRequest newSchedulingRequest =
SchedulingRequest.newBuilder().executionType(
ExecutionTypeRequest.newInstance(ExecutionType.GUARANTEED))
.allocationRequestId(10L).priority(Priority.newInstance(1))
.placementConstraintExpression(PlacementConstraints
.targetNotIn(PlacementConstraints.NODE,
PlacementConstraints.PlacementTargets.nodePartition(""),
PlacementConstraints.PlacementTargets
.allocationTag("mapper", "reducer"))
.build()).resourceSizing(
ResourceSizing.newInstance(11, Resource.newInstance(1024, 1)))
.build();
allocator.updatePendingAsk(schedulerRequestKey, newSchedulingRequest, false);
// Update allocator with scheduling request different at resource,
// should failed.
schedulingRequest.getResourceSizing().setResources(