Repository: hadoop Updated Branches: refs/heads/branch-2.8 639380eff -> a54c3437a
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/a54c3437 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a54c3437 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a54c3437 Branch: refs/heads/branch-2.8 Commit: a54c3437af8ad5384bfd0f6f68ef0f45197fa4a8 Parents: 639380e Author: Kihwal Lee <kih...@apache.org> Authored: Wed Aug 9 16:51:19 2017 -0500 Committer: Kihwal Lee <kih...@apache.org> Committed: Wed Aug 9 16:51:19 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/a54c3437/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 e160c9f..99edc44 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,9 +26,10 @@ 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.SortedMap; import java.util.TreeMap; +import java.util.TreeSet; import com.google.common.collect.Lists; import org.apache.commons.logging.Log; @@ -84,11 +85,15 @@ public class LeaseManager { // 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 @@ -428,9 +433,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
