YARN-5131. Distributed shell AM fails when extra container arrives during finishing. Contributed by Wangda Tan.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/48c93133 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/48c93133 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/48c93133 Branch: refs/heads/HDFS-1312 Commit: 48c931331cc43970e31866732f9ac82ee806ee03 Parents: dcbb700 Author: Junping Du <junping...@apache.org> Authored: Wed May 25 06:18:11 2016 -0700 Committer: Junping Du <junping...@apache.org> Committed: Wed May 25 06:18:11 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/48c93133/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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
