You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2017/09/20 04:54:06 UTC
[78/84] [abbrv] hadoop git commit: Rebase onto latest trunk. minor
conflicts
Rebase onto latest trunk. minor conflicts
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/49c8c875
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/49c8c875
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/49c8c875
Branch: refs/heads/yarn-native-services
Commit: 49c8c8753245fc082b5e83430632d2e3a5e1b9b2
Parents: e539b2a
Author: Jian He <ji...@apache.org>
Authored: Wed Aug 30 22:48:35 2017 -0700
Committer: Jian He <ji...@apache.org>
Committed: Tue Sep 19 21:36:21 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/yarn/util/Apps.java | 2 ++
.../rmapp/attempt/RMAppAttemptImpl.java | 35 ++------------------
2 files changed, 4 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/49c8c875/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java
index 75b4633..e88d2b2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java
@@ -150,6 +150,8 @@ public class Apps {
}
// Check if should black list the node based on container exit status
+ @Private
+ @Unstable
public static boolean shouldCountTowardsNodeBlacklisting(int exitStatus) {
switch (exitStatus) {
case ContainerExitStatus.PREEMPTED:
http://git-wip-us.apache.org/repos/asf/hadoop/blob/49c8c875/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
index fa29e00..a0aa284 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
@@ -109,6 +109,7 @@ import org.apache.hadoop.yarn.state.MultipleArcTransition;
import org.apache.hadoop.yarn.state.SingleArcTransition;
import org.apache.hadoop.yarn.state.StateMachine;
import org.apache.hadoop.yarn.state.StateMachineFactory;
+import org.apache.hadoop.yarn.util.Apps;
import org.apache.hadoop.yarn.util.BoundedAppender;
import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
@@ -1556,38 +1557,6 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
}
}
- private static boolean shouldCountTowardsNodeBlacklisting(int exitStatus) {
- switch (exitStatus) {
- case ContainerExitStatus.PREEMPTED:
- case ContainerExitStatus.KILLED_BY_RESOURCEMANAGER:
- case ContainerExitStatus.KILLED_BY_APPMASTER:
- case ContainerExitStatus.KILLED_AFTER_APP_COMPLETION:
- case ContainerExitStatus.ABORTED:
- // Neither the app's fault nor the system's fault. This happens by design,
- // so no need for skipping nodes
- return false;
- case ContainerExitStatus.DISKS_FAILED:
- // This container is marked with this exit-status means that the node is
- // already marked as unhealthy given that most of the disks failed. So, no
- // need for any explicit skipping of nodes.
- return false;
- case ContainerExitStatus.KILLED_EXCEEDED_VMEM:
- case ContainerExitStatus.KILLED_EXCEEDED_PMEM:
- // No point in skipping the node as it's not the system's fault
- return false;
- case ContainerExitStatus.SUCCESS:
- return false;
- case ContainerExitStatus.INVALID:
- // Ideally, this shouldn't be considered for skipping a node. But in
- // reality, it seems like there are cases where we are not setting
- // exit-code correctly and so it's better to be conservative. See
- // YARN-4284.
- return true;
- default:
- return true;
- }
- }
-
private static final class UnmanagedAMAttemptSavedTransition
extends AMLaunchedTransition {
@Override
@@ -1971,7 +1940,7 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
containerFinishedEvent.getContainerStatus();
if (containerStatus != null) {
int exitStatus = containerStatus.getExitStatus();
- if (shouldCountTowardsNodeBlacklisting(exitStatus)) {
+ if (Apps.shouldCountTowardsNodeBlacklisting(exitStatus)) {
appAttempt.addAMNodeToBlackList(nodeId);
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org