From f4188fa504c5eea0639a48ad61d1d83d75b5c49a Mon Sep 17 00:00:00 2001 From: Gergely Pollak Date: Sun, 17 Jan 2021 00:33:35 +0100 Subject: [PATCH 1/2] YARN-10574 Fix the FindBugs warning introduced in YARN-10506 Change-Id: I1977749dce7e362f728c3a6d0efd1a7b31dac312 --- .../resourcemanager/scheduler/capacity/CapacityScheduler.java | 3 +-- 1 file changed, 1 insertion(+), 2 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/capacity/CapacityScheduler.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/CapacityScheduler.java index 89c1cf752ea..5ee557a689c 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/CapacityScheduler.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/CapacityScheduler.java @@ -3387,8 +3387,7 @@ private LeafQueue autoCreateLeafQueue( + "which does not exist " + parentQueueName); } - if (parentQueue != null && - conf.isAutoCreateChildQueueEnabled(parentQueue.getQueuePath())) { + if (conf.isAutoCreateChildQueueEnabled(parentQueue.getQueuePath())) { // Case 1: Handle ManagedParentQueue AutoCreatedLeafQueue autoCreatedLeafQueue = null; ManagedParentQueue autoCreateEnabledParentQueue = -- 2.26.2