From fad2c5b8629d0b3f36cc61d1df0c75a6446744b8 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Wed, 16 Dec 2015 23:22:31 +0000 Subject: [PATCH] YARN-4461. Redundant nodeLocalityDelay log in LeafQueue. Contributed by Eric Payne (cherry picked from commit 91828fef6b9314f72d1f973f00e81404dc6bba91) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../server/resourcemanager/scheduler/capacity/LeafQueue.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 34cdcf66ba3..cfdb1c78a03 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1099,6 +1099,9 @@ Release 2.8.0 - UNRELEASED YARN-4416. Deadlock due to synchronised get Methods in AbstractCSQueue. (Naganarasimha G R via wangda) + YARN-4461. Redundant nodeLocalityDelay log in LeafQueue (Eric Payne via + jlowe) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES 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/capacity/LeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java index 6c70a69291c..be1ba89ef06 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java @@ -253,7 +253,6 @@ public class LeafQueue extends AbstractCSQueue { " [= configuredAcls ]" + "\n" + "nodeLocalityDelay = " + nodeLocalityDelay + "\n" + "labels=" + labelStrBuilder.toString() + "\n" + - "nodeLocalityDelay = " + nodeLocalityDelay + "\n" + "reservationsContinueLooking = " + reservationsContinueLooking + "\n" + "preemptionDisabled = " + getPreemptionDisabled() + "\n" +