diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceSet.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceSet.java index 6df1073..745f8a8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceSet.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceSet.java @@ -136,6 +136,10 @@ } public void resourceLocalizationFailed(LocalResourceRequest request) { + // Skip null request when localization failed for running container + if (request == null) { + return; + } pendingResources.remove(request); resourcesFailedToBeLocalized.add(request); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java index 64e6cf0..ffb4b44 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/TestContainer.java @@ -379,6 +379,27 @@ public void testLocalizationFailureAtDone() throws Exception { } @Test + @SuppressWarnings("unchecked") + public void testLocalizationFailureWhileRunning() + throws Exception { + WrappedContainer wc = null; + try { + wc = new WrappedContainer(6, 314159265358979L, 4344, "yak"); + wc.initContainer(); + wc.localizeResources(); + wc.launchContainer(); + reset(wc.localizerBus); + assertEquals(ContainerState.RUNNING, wc.c.getContainerState()); + // Now in RUNNING, handle ContainerResourceFailedEvent, cause NPE before + wc.handleContainerResourceFailedEvent(); + } finally { + if (wc != null) { + wc.finished(); + } + } + } + + @Test @SuppressWarnings("unchecked") // mocked generic public void testCleanupOnKillRequest() throws Exception { WrappedContainer wc = null; @@ -1132,6 +1153,11 @@ public void resourceFailedContainer() { drainDispatcherEvents(); } + public void handleContainerResourceFailedEvent() { + c.handle(new ContainerResourceFailedEvent(cId,null, null)); + drainDispatcherEvents(); + } + // Localize resources // Skip some resources so as to consider them failed public Map> doLocalizeResources(