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 wa...@apache.org on 2014/10/22 23:37:20 UTC
git commit: HDFS-2486. Remove unnecessary priority level checks in
UnderReplicatedBlocks. Contributed by Uma Maheswara Rao G
Repository: hadoop
Updated Branches:
refs/heads/branch-2 b3bb4fdc7 -> 3e2889f3c
HDFS-2486. Remove unnecessary priority level checks in UnderReplicatedBlocks. Contributed by Uma Maheswara Rao G
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242636 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit dc847b39fdee85b45ef26e8e7380d722ffb89e4e)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3e2889f3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3e2889f3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3e2889f3
Branch: refs/heads/branch-2
Commit: 3e2889f3c7e61b7059ab15c0b46e7d79a2450527
Parents: b3bb4fd
Author: Tsz-wo Sze <sz...@apache.org>
Authored: Fri Feb 10 02:05:38 2012 +0000
Committer: Andrew Wang <wa...@apache.org>
Committed: Wed Oct 22 14:37:15 2014 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hdfs/server/blockmanagement/UnderReplicatedBlocks.java | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e2889f3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index ad4f90a..167a789 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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e2889f3/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java
----------------------------------------------------------------------
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 0920afc..8d20016 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 @@ class UnderReplicatedBlocks implements Iterable<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 @@ class UnderReplicatedBlocks implements Iterable<Block> {
" 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:"