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 pb...@apache.org on 2021/04/23 15:39:35 UTC
[hadoop] branch trunk updated: YARN-10705. Misleading DEBUG log for
container assignment needs to be removed when the container is actually
reserved, not assigned in FairScheduler. Contributed by Siddharth Ahuja.
This is an automated email from the ASF dual-hosted git repository.
pbacsko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 14a84c4 YARN-10705. Misleading DEBUG log for container assignment needs to be removed when the container is actually reserved, not assigned in FairScheduler. Contributed by Siddharth Ahuja.
14a84c4 is described below
commit 14a84c47b0efe287fb848856767b115cf5af4175
Author: Peter Bacsko <pb...@cloudera.com>
AuthorDate: Fri Apr 23 17:38:34 2021 +0200
YARN-10705. Misleading DEBUG log for container assignment needs to be removed when the container is actually reserved, not assigned in FairScheduler. Contributed by Siddharth Ahuja.
---
.../resourcemanager/scheduler/fair/FSLeafQueue.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
index 5eafa52..af366ec 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
@@ -352,9 +352,19 @@ public class FSLeafQueue extends FSQueue {
continue;
}
assigned = sched.assignContainer(node);
- if (!assigned.equals(none())) {
- LOG.debug("Assigned container in queue:{} container:{}",
- getName(), assigned);
+
+ boolean isContainerAssignedOrReserved = !assigned.equals(none());
+ boolean isContainerReserved =
+ assigned.equals(FairScheduler.CONTAINER_RESERVED);
+
+ // check if an assignment or a reservation was made.
+ if (isContainerAssignedOrReserved) {
+ // only log container assignment if there was an actual allocation,
+ // not a reservation.
+ if (!isContainerReserved && LOG.isDebugEnabled()) {
+ LOG.debug("Assigned container in queue:{} container:{}",
+ getName(), assigned);
+ }
break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org