You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2014/12/17 21:03:22 UTC
hadoop git commit: YARN-2964. FSLeafQueue#assignContainer - document
the reason for using both write and read locks. (Tsuyoshi Ozawa via kasha)
Repository: hadoop
Updated Branches:
refs/heads/trunk 9b4ba409c -> f2d150ea1
YARN-2964. FSLeafQueue#assignContainer - document the reason for using both write and read locks. (Tsuyoshi Ozawa via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f2d150ea
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f2d150ea
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f2d150ea
Branch: refs/heads/trunk
Commit: f2d150ea1205b77a75c347ace667b4cd060aaf40
Parents: 9b4ba40
Author: Karthik Kambatla <ka...@apache.org>
Authored: Wed Dec 17 12:03:16 2014 -0800
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Wed Dec 17 12:03:16 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2d150ea/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 37147d7..42ffa9b 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -231,6 +231,9 @@ Release 2.7.0 - UNRELEASED
YARN-2914. [YARN-1492] Potential race condition in Singleton implementation of
SharedCacheUploaderMetrics, CleanerMetrics, ClientSCMMetrics. (Varun Saxena via kasha)
+ YARN-2964. FSLeafQueue#assignContainer - document the reason for using both write and
+ read locks. (Tsuyoshi Ozawa via kasha)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2d150ea/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
----------------------------------------------------------------------
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/fair/FSLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
index bbf1be7..63450da 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FSLeafQueue.java
@@ -252,6 +252,9 @@ public class FSLeafQueue extends FSQueue {
} finally {
writeLock.unlock();
}
+ // Release write lock here for better performance and avoiding deadlocks.
+ // runnableApps can be in unsorted state because of this section,
+ // but we can accept it in practice since the probability is low.
readLock.lock();
try {
for (FSAppAttempt sched : runnableApps) {