From 09d8e0dc32c190dbf94b0c5fe53b2b40226ffb7b Mon Sep 17 00:00:00 2001 From: Masatake Iwasaki Date: Wed, 8 Jul 2020 23:22:47 +0900 Subject: [PATCH] YARN-10347. Fix double locking in CapacityScheduler#reinitialize in branch-3.1. --- .../resourcemanager/scheduler/capacity/CapacityScheduler.java | 1 - 1 file changed, 1 deletion(-) 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 71ff8068764..b9ec379cad6 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 @@ -434,7 +434,6 @@ public void reinitialize(Configuration newConf, RMContext rmContext, boolean validation) throws IOException { writeLock.lock(); try { - writeLock.lock(); Configuration configuration = new Configuration(newConf); CapacitySchedulerConfiguration oldConf = this.conf; if (validation) { -- 2.18.1