This is an automated email from the ASF dual-hosted git repository. gabota pushed a commit to branch branch-3.1.4 in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1.4 by this push: new 9dd1aa0 YARN-10347. Fix double locking in CapacityScheduler#reinitialize in branch-3.1. 9dd1aa0 is described below commit 9dd1aa09844bc8354df3d94b67f13416339110f6 Author: Masatake Iwasaki <iwasak...@apache.org> AuthorDate: Wed Jul 8 23:22:47 2020 +0900 YARN-10347. Fix double locking in CapacityScheduler#reinitialize in branch-3.1. (cherry picked from commit 4fa8055aa4624b4073b95c89e4c3a58e8d8117a0) --- .../server/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 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 @@ public class CapacityScheduler extends boolean validation) throws IOException { writeLock.lock(); try { - writeLock.lock(); Configuration configuration = new Configuration(newConf); CapacitySchedulerConfiguration oldConf = this.conf; if (validation) { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org