hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jl...@apache.org
Subject hadoop git commit: YARN-5103. With NM recovery enabled, restarting NM multiple times results in AM restart. Contributed by Junping Du
Date Mon, 23 May 2016 15:16:36 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 6161d9ba5 -> d1df0266c


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d1df0266
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d1df0266
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d1df0266

Branch: refs/heads/trunk
Commit: d1df0266cf4e9ff0ec70813c156556ca4e74f791
Parents: 6161d9b
Author: Jason Lowe <jlowe@apache.org>
Authored: Mon May 23 15:15:27 2016 +0000
Committer: Jason Lowe <jlowe@apache.org>
Committed: Mon May 23 15:15:27 2016 +0000

----------------------------------------------------------------------
 .../containermanager/launcher/RecoveredContainerLaunch.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d1df0266/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message