YARN-1381. Same relaxLocality appears twice in exception message of AMRMClientImpl#checkLocalityRelaxationConflict() (Ted Yu via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537636 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
ad46e707f4
commit
3c0ad2500d
|
@ -163,6 +163,9 @@ Release 2.2.1 - UNRELEASED
|
|||
YARN-1343. NodeManagers additions/restarts are not reported as node updates
|
||||
in AllocateResponse responses to AMs. (tucu)
|
||||
|
||||
YARN-1381. Same relaxLocality appears twice in exception message of
|
||||
AMRMClientImpl#checkLocalityRelaxationConflict() (Ted Yu via Sandy Ryza)
|
||||
|
||||
Release 2.2.0 - 2013-10-13
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -499,13 +499,15 @@ public class AMRMClientImpl<T extends ContainerRequest> extends AMRMClient<T> {
|
|||
for (String location : locations) {
|
||||
TreeMap<Resource, ResourceRequestInfo> reqs =
|
||||
remoteRequests.get(location);
|
||||
if (reqs != null && !reqs.isEmpty()
|
||||
&& reqs.values().iterator().next().remoteRequest.getRelaxLocality()
|
||||
!= relaxLocality) {
|
||||
throw new InvalidContainerRequestException("Cannot submit a "
|
||||
+ "ContainerRequest asking for location " + location
|
||||
+ " with locality relaxation " + relaxLocality + " when it has "
|
||||
+ "already been requested with locality relaxation " + relaxLocality);
|
||||
if (reqs != null && !reqs.isEmpty()) {
|
||||
boolean existingRelaxLocality =
|
||||
reqs.values().iterator().next().remoteRequest.getRelaxLocality();
|
||||
if (relaxLocality != existingRelaxLocality) {
|
||||
throw new InvalidContainerRequestException("Cannot submit a "
|
||||
+ "ContainerRequest asking for location " + location
|
||||
+ " with locality relaxation " + relaxLocality + " when it has "
|
||||
+ "already been requested with locality relaxation " + existingRelaxLocality);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue