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

YARN-4530. LocalizedResource trigger a NPE Cause the NodeManager exit. (tangshangwen via rohithsharmaks) 

(cherry picked from commit f9e36dea96)
This commit is contained in:
Rohith Sharma K S 2016-01-04 09:58:13 +05:30
parent 05fa852d75
commit ae25e283cf
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,9 @@ Release 2.9.0 - UNRELEASED
YARN-2934. Improve handling of container's stderr. YARN-2934. Improve handling of container's stderr.
(Naganarasimha G R via gera) (Naganarasimha G R via gera)
YARN-4530. LocalizedResource trigger a NPE Cause the NodeManager exit
(tangshangwen via rohithsharmaks)
Release 2.8.0 - UNRELEASED Release 2.8.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-yarn-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

@ -878,12 +878,12 @@ public class ResourceLocalizationService extends CompositeService
Future<Path> completed = queue.take(); Future<Path> completed = queue.take();
LocalizerResourceRequestEvent assoc = pending.remove(completed); LocalizerResourceRequestEvent assoc = pending.remove(completed);
try { try {
Path local = completed.get();
if (null == assoc) { if (null == assoc) {
LOG.error("Localized unknown resource to " + completed); LOG.error("Localized unknown resource to " + completed);
// TODO delete // TODO delete
return; return;
} }
Path local = completed.get();
LocalResourceRequest key = assoc.getResource().getRequest(); LocalResourceRequest key = assoc.getResource().getRequest();
publicRsrc.handle(new ResourceLocalizedEvent(key, local, FileUtil publicRsrc.handle(new ResourceLocalizedEvent(key, local, FileUtil
.getDU(new File(local.toUri())))); .getDU(new File(local.toUri()))));