Repository: hadoop Updated Branches: refs/heads/branch-2.8 4422beab7 -> 8e404b432
YARN-5103. With NM recovery enabled, restarting NM multiple times results in AM restart. Contributed by Junping Du (cherry picked from commit d1df0266cf4e9ff0ec70813c156556ca4e74f791) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8e404b43 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8e404b43 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8e404b43 Branch: refs/heads/branch-2.8 Commit: 8e404b4321d14c73b8c03af82932984d1d0a0b35 Parents: 4422bea Author: Jason Lowe <jl...@apache.org> Authored: Mon May 23 15:15:27 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Mon May 23 15:17:26 2016 +0000 ---------------------------------------------------------------------- .../containermanager/launcher/RecoveredContainerLaunch.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8e404b43/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 ---------------------------------------------------------------------- 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/launcher/RecoveredContainerLaunch.java b/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 index 66f5a2a..b9bdcc6 100644 --- a/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 +++ b/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 @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.server.nodemanager.containermanager.launcher; import java.io.File; +import java.io.InterruptedIOException; import java.io.IOException; import org.apache.commons.logging.Log; @@ -90,11 +91,11 @@ public class RecoveredContainerLaunch extends ContainerLaunch { } else { LOG.warn("Unable to locate pid file for container " + containerIdStr); } - } catch (IOException e) { - LOG.error("Unable to recover container " + containerIdStr, e); - } catch (InterruptedException e) { + } catch (InterruptedException | InterruptedIOException e) { LOG.warn("Interrupted while waiting for exit code from " + containerId); notInterrupted = false; + } catch (IOException e) { + LOG.error("Unable to recover container " + containerIdStr, e); } finally { if (notInterrupted) { this.completed.set(true); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
