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

Merge -r 1169954:1169955 from trunk to branch-0.23 to fix MAPREDUCE-2985. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169956 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-09-12 21:54:32 +00:00
parent 5c170d84ec
commit 6bec78654c
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -1267,6 +1267,9 @@ Release 0.23.0 - Unreleased
MAPREDUCE-2979. Removed the needless ClientProtocolProvider configuration
from the hadoop-mapreduce-client-core module. (Siddharth Seth via vinodkv)
MAPREDUCE-2985. Fixed findbugs warnings in ResourceLocalizationService.
(Thomas Graves via acmurthy)
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES

16
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
View File

@ -289,11 +289,12 @@ public class ResourceLocalizationService extends AbstractService
LocalizerContext ctxt = new LocalizerContext(
c.getUser(), c.getContainerID(), c.getCredentials());
rsrcs = rsrcReqs.getRequestedResources();
for (LocalResourceVisibility vis : rsrcs.keySet()) {
tracker = getLocalResourcesTracker(vis, c.getUser(),
for (Map.Entry<LocalResourceVisibility, Collection<LocalResourceRequest>> e :
rsrcs.entrySet()) {
tracker = getLocalResourcesTracker(e.getKey(), c.getUser(),
c.getContainerID().getAppId());
for (LocalResourceRequest req : rsrcs.get(vis)) {
tracker.handle(new ResourceRequestEvent(req, vis, ctxt));
for (LocalResourceRequest req : e.getValue()) {
tracker.handle(new ResourceRequestEvent(req, e.getKey(), ctxt));
}
}
break;
@ -312,10 +313,11 @@ public class ResourceLocalizationService extends AbstractService
(ContainerLocalizationCleanupEvent) event;
c = rsrcCleanup.getContainer();
rsrcs = rsrcCleanup.getResources();
for (LocalResourceVisibility vis : rsrcs.keySet()) {
tracker = getLocalResourcesTracker(vis, c.getUser(),
for (Map.Entry<LocalResourceVisibility, Collection<LocalResourceRequest>> e :
rsrcs.entrySet()) {
tracker = getLocalResourcesTracker(e.getKey(), c.getUser(),
c.getContainerID().getAppId());
for (LocalResourceRequest req : rsrcs.get(vis)) {
for (LocalResourceRequest req : e.getValue()) {
tracker.handle(new ResourceReleaseEvent(req, c.getContainerID()));
}
}