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

YARN-5103. With NM recovery enabled, restarting NM multiple times results in AM restart. Contributed by Junping Du 

(cherry picked from commit d1df0266cf)
This commit is contained in:
Jason Lowe 2016-05-23 15:15:27 +00:00
parent 4422beab72
commit 8e404b4321
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/RecoveredContainerLaunch.java
View File

@ -19,6 +19,7 @@
package org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher; package org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher;
import java.io.File; import java.io.File;
import java.io.InterruptedIOException;
import java.io.IOException; import java.io.IOException;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -90,11 +91,11 @@ public class RecoveredContainerLaunch extends ContainerLaunch {
} else { } else {
LOG.warn("Unable to locate pid file for container " + containerIdStr); LOG.warn("Unable to locate pid file for container " + containerIdStr);
} }
} catch (IOException e) { } catch (InterruptedException | InterruptedIOException e) {
LOG.error("Unable to recover container " + containerIdStr, e);
} catch (InterruptedException e) {
LOG.warn("Interrupted while waiting for exit code from " + containerId); LOG.warn("Interrupted while waiting for exit code from " + containerId);
notInterrupted = false; notInterrupted = false;
} catch (IOException e) {
LOG.error("Unable to recover container " + containerIdStr, e);
} finally { } finally {
if (notInterrupted) { if (notInterrupted) {
this.completed.set(true); this.completed.set(true);