hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From junping...@apache.org
Subject hadoop git commit: YARN-5131. Distributed shell AM fails when extra container arrives during finishing. Contributed by Wangda Tan. (cherry picked from commit 48c931331cc43970e31866732f9ac82ee806ee03)
Date Wed, 25 May 2016 13:20:59 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 e28a51e98 -> 2e42bafdc


YARN-5131. Distributed shell AM fails when extra container arrives during finishing. Contributed
by Wangda Tan.
(cherry picked from commit 48c931331cc43970e31866732f9ac82ee806ee03)


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

Branch: refs/heads/branch-2
Commit: 2e42bafdc8d1eb23c3ef0eaea030d2517e08c9f4
Parents: e28a51e
Author: Junping Du <junping_du@apache.org>
Authored: Wed May 25 06:18:11 2016 -0700
Committer: Junping Du <junping_du@apache.org>
Committed: Wed May 25 06:19:29 2016 -0700

----------------------------------------------------------------------
 .../yarn/applications/distributedshell/ApplicationMaster.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e42bafd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
index 2973974..e72adf5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/main/java/org/apache/hadoop/yarn/applications/distributedshell/ApplicationMaster.java
@@ -745,8 +745,8 @@ public class ApplicationMaster {
     FinalApplicationStatus appStatus;
     String appMessage = null;
     boolean success = true;
-    if (numFailedContainers.get() == 0 && 
-        numCompletedContainers.get() == numTotalContainers) {
+    if (numCompletedContainers.get() - numFailedContainers.get()
+        >= numTotalContainers) {
       appStatus = FinalApplicationStatus.SUCCEEDED;
     } else {
       appStatus = FinalApplicationStatus.FAILED;


---------------------------------------------------------------------
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