diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index ad4f90a0bd3..167a789c057 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -34,6 +34,9 @@ Release 2.7.0 - UNRELEASED HDFS-6877. Avoid calling checkDisk when an HDFS volume is removed during a write. (Lei Xu via Colin P. McCabe) + HDFS-2486. Remove unnecessary priority level checks in + UnderReplicatedBlocks. (Uma Maheswara Rao G via szetszwo) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java index 0920afcd997..8d20016ecc8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java @@ -190,7 +190,7 @@ synchronized boolean add(Block block, assert curReplicas >= 0 : "Negative replicas!"; int priLevel = getPriority(block, curReplicas, decomissionedReplicas, expectedReplicas); - if(priLevel != LEVEL && priorityQueues.get(priLevel).add(block)) { + if(priorityQueues.get(priLevel).add(block)) { if(NameNode.blockStateChangeLog.isDebugEnabled()) { NameNode.blockStateChangeLog.debug( "BLOCK* NameSystem.UnderReplicationBlock.add:" @@ -293,10 +293,10 @@ synchronized void update(Block block, int curReplicas, " curPri " + curPri + " oldPri " + oldPri); } - if(oldPri != LEVEL && oldPri != curPri) { + if(oldPri != curPri) { remove(block, oldPri); } - if(curPri != LEVEL && priorityQueues.get(curPri).add(block)) { + if(priorityQueues.get(curPri).add(block)) { if(NameNode.blockStateChangeLog.isDebugEnabled()) { NameNode.blockStateChangeLog.debug( "BLOCK* NameSystem.UnderReplicationBlock.update:"