Skip to content

[TEZ-4315] rectifying the potential risk of ConcurrentModificationException when getMatchingRequestWithoutPriority #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chenjunbiao001 wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −37
Open

[TEZ-4315] rectifying the potential risk of ConcurrentModificationException when getMatchingRequestWithoutPriority #133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 39 additions & 37 deletions tez-dag/src/main/java/org/apache/tez/dag/app/rm/YarnTaskSchedulerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1476,44 +1476,46 @@ private CookieContainerRequest getMatchingRequestWithoutPriority(
return null;
}
CookieContainerRequest firstMatch = null;
for (Collection<CookieContainerRequest> requests : pRequestsList) {
for (CookieContainerRequest cookieContainerRequest : requests) {
if (firstMatch == null || // we dont have a match. So look for one
// we have a match but are looking for a better container level match.
// skip the expensive canAssignTaskToContainer() if the request is
// not affinitized to the container
container.getId().equals(cookieContainerRequest.getAffinitizedContainer())
) {
if (canAssignTaskToContainer(cookieContainerRequest, container)) {
// request matched to container
if (!considerContainerAffinity) {
return cookieContainerRequest;
}
ContainerId affCId = cookieContainerRequest.getAffinitizedContainer();
boolean canMatchTaskWithAffinity = true;
if (affCId == null ||
!heldContainers.containsKey(affCId) ||
inUseContainers.contains(affCId)) {
// affinity not specified
// affinitized container is no longer held
// affinitized container is in use
canMatchTaskWithAffinity = false;
}
if (canMatchTaskWithAffinity) {
if (container.getId().equals(
cookieContainerRequest.getAffinitizedContainer())) {
// container level match
LOG.debug("Matching with affinity for request: {} container: {}",
cookieContainerRequest, affCId);
synchronized (this) {
for (Collection<CookieContainerRequest> requests : pRequestsList) {
for (CookieContainerRequest cookieContainerRequest : requests) {
if (firstMatch == null || // we dont have a match. So look for one
// we have a match but are looking for a better container level match.
// skip the expensive canAssignTaskToContainer() if the request is
// not affinitized to the container
container.getId().equals(cookieContainerRequest.getAffinitizedContainer())
) {
if (canAssignTaskToContainer(cookieContainerRequest, container)) {
// request matched to container
if (!considerContainerAffinity) {
return cookieContainerRequest;
}
if (LOG.isDebugEnabled()) {
LOG.debug("Skipping request for container " + container.getId()
+ " due to affinity. Request: " + cookieContainerRequest
+ " affContainer: " + affCId);
ContainerId affCId = cookieContainerRequest.getAffinitizedContainer();
boolean canMatchTaskWithAffinity = true;
if (affCId == null ||
!heldContainers.containsKey(affCId) ||
inUseContainers.contains(affCId)) {
// affinity not specified
// affinitized container is no longer held
// affinitized container is in use
canMatchTaskWithAffinity = false;
}
if (canMatchTaskWithAffinity) {
if (container.getId().equals(
cookieContainerRequest.getAffinitizedContainer())) {
// container level match
LOG.debug("Matching with affinity for request: {} container: {}",
cookieContainerRequest, affCId);
return cookieContainerRequest;
}
if (LOG.isDebugEnabled()) {
LOG.debug("Skipping request for container " + container.getId()
+ " due to affinity. Request: " + cookieContainerRequest
+ " affContainer: " + affCId);
}
} else {
firstMatch = cookieContainerRequest;
}
} else {
firstMatch = cookieContainerRequest;
}
}
}
Expand Down Expand Up @@ -1633,7 +1635,7 @@ private void pushNewContainerToDelayed(List<Container> containers){
delayedContainerManager.triggerScheduling(false);
}

private CookieContainerRequest removeTaskRequest(Object task) {
private synchronized CookieContainerRequest removeTaskRequest(Object task) {
CookieContainerRequest request = taskRequests.remove(task);
if(request != null) {
// remove all references of the request from AMRMClient
Expand All @@ -1642,7 +1644,7 @@ private CookieContainerRequest removeTaskRequest(Object task) {
return request;
}

private void addTaskRequest(Object task,
private synchronized void addTaskRequest(Object task,
CookieContainerRequest request) {
CookieContainerRequest oldRequest = taskRequests.put(task, request);
if (oldRequest != null) {
Expand Down