| commit | 9dd1aa09844bc8354df3d94b67f13416339110f6 | [log] [tgz] |
|---|---|---|
| author | Masatake Iwasaki <iwasakims@apache.org> | Wed Jul 08 23:22:47 2020 +0900 |
| committer | Gabor Bota <gabota@apache.org> | Sun Jul 12 20:18:41 2020 +0200 |
| tree | cf0dc9399ab233d8e81cf72b6aee2437107c060f | |
| parent | 4ef7dab2153d1ad30023c43da8954fceb6a01ccb [diff] |
YARN-10347. Fix double locking in CapacityScheduler#reinitialize in branch-3.1. (cherry picked from commit 4fa8055aa4624b4073b95c89e4c3a58e8d8117a0)
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 40f575d..9f9ab7c 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 @@ boolean validation) throws IOException { writeLock.lock(); try { - writeLock.lock(); Configuration configuration = new Configuration(newConf); CapacitySchedulerConfiguration oldConf = this.conf; if (validation) {