HDFS-12278. LeaseManager operations are inefficient in 2.8. Contributed by Rushabh S Shah.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b5c02f95 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b5c02f95 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b5c02f95 Branch: refs/heads/YARN-1011 Commit: b5c02f95b5a2fcb8931d4a86f8192caa18009ea9 Parents: ec69414 Author: Kihwal Lee <kih...@apache.org> Authored: Wed Aug 9 16:46:05 2017 -0500 Committer: Kihwal Lee <kih...@apache.org> Committed: Wed Aug 9 16:46:05 2017 -0500 ---------------------------------------------------------------------- .../hadoop/hdfs/server/namenode/LeaseManager.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5c02f95/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java index 6578ba9..35ec063 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java @@ -26,10 +26,11 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashSet; import java.util.List; -import java.util.PriorityQueue; +import java.util.NavigableSet; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; +import java.util.TreeSet; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -87,11 +88,15 @@ public class LeaseManager { // Mapping: leaseHolder -> Lease private final SortedMap<String, Lease> leases = new TreeMap<>(); // Set of: Lease - private final PriorityQueue<Lease> sortedLeases = new PriorityQueue<>(512, + private final NavigableSet<Lease> sortedLeases = new TreeSet<>( new Comparator<Lease>() { @Override public int compare(Lease o1, Lease o2) { - return Long.signum(o1.getLastUpdate() - o2.getLastUpdate()); + if (o1.getLastUpdate() != o2.getLastUpdate()) { + return Long.signum(o1.getLastUpdate() - o2.getLastUpdate()); + } else { + return o1.holder.compareTo(o2.holder); + } } }); // INodeID -> Lease @@ -528,9 +533,10 @@ public class LeaseManager { long start = monotonicNow(); - while(!sortedLeases.isEmpty() && sortedLeases.peek().expiredHardLimit() - && !isMaxLockHoldToReleaseLease(start)) { - Lease leaseToCheck = sortedLeases.peek(); + while(!sortedLeases.isEmpty() && + sortedLeases.first().expiredHardLimit() + && !isMaxLockHoldToReleaseLease(start)) { + Lease leaseToCheck = sortedLeases.first(); LOG.info(leaseToCheck + " has expired hard limit"); final List<Long> removing = new ArrayList<>(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
