You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2011/09/12 23:54:33 UTC
svn commit: r1169956 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/
Author: acmurthy
Date: Mon Sep 12 21:54:32 2011
New Revision: 1169956
URL: http://svn.apache.org/viewvc?rev=1169956&view=rev
Log:
Merge -r 1169954:1169955 from trunk to branch-0.23 to fix MAPREDUCE-2985.
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/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
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1169956&r1=1169955&r2=1169956&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Mon Sep 12 21:54:32 2011
@@ -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
Modified: hadoop/common/branches/branch-0.23/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
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/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?rev=1169956&r1=1169955&r2=1169956&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/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 (original)
+++ hadoop/common/branches/branch-0.23/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 Mon Sep 12 21:54:32 2011
@@ -289,11 +289,12 @@ public class ResourceLocalizationService
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
(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()));
}
}