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 aa...@apache.org on 2018/02/02 05:34:56 UTC
hadoop git commit: HDFS-13048. LowRedundancyReplicatedBlocks metric
can be negative
Repository: hadoop
Updated Branches:
refs/heads/trunk b0627c891 -> 4aef8bd2e
HDFS-13048. LowRedundancyReplicatedBlocks metric can be negative
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4aef8bd2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4aef8bd2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4aef8bd2
Branch: refs/heads/trunk
Commit: 4aef8bd2efd68bf96c077ddda1538dcd5691b437
Parents: b0627c8
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Feb 2 14:33:56 2018 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri Feb 2 14:34:07 2018 +0900
----------------------------------------------------------------------
.../server/blockmanagement/LowRedundancyBlocks.java | 2 +-
.../TestLowRedundancyBlockQueues.java | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4aef8bd2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/LowRedundancyBlocks.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/LowRedundancyBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/LowRedundancyBlocks.java
index 347d606..e3f228d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/LowRedundancyBlocks.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/LowRedundancyBlocks.java
@@ -365,7 +365,7 @@ class LowRedundancyBlocks implements Iterable<BlockInfo> {
NameNode.blockStateChangeLog.debug(
"BLOCK* NameSystem.LowRedundancyBlock.remove: Removing block" +
" {} from priority queue {}", block, i);
- decrementBlockStat(block, priLevel, oldExpectedReplicas);
+ decrementBlockStat(block, i, oldExpectedReplicas);
return true;
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4aef8bd2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestLowRedundancyBlockQueues.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestLowRedundancyBlockQueues.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestLowRedundancyBlockQueues.java
index 2b28f1e..0681a0b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestLowRedundancyBlockQueues.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestLowRedundancyBlockQueues.java
@@ -124,6 +124,21 @@ public class TestLowRedundancyBlockQueues {
}
@Test
+ public void testRemoveWithWrongPriority() {
+ final LowRedundancyBlocks queues = new LowRedundancyBlocks();
+ final BlockInfo corruptBlock = genBlockInfo(1);
+ assertAdded(queues, corruptBlock, 0, 0, 3);
+ assertInLevel(queues, corruptBlock,
+ LowRedundancyBlocks.QUEUE_WITH_CORRUPT_BLOCKS);
+ verifyBlockStats(queues, 0, 1, 0, 0, 0);
+
+ // Remove with wrong priority
+ queues.remove(corruptBlock, LowRedundancyBlocks.QUEUE_LOW_REDUNDANCY);
+ // Verify the number of corrupt block is decremented
+ verifyBlockStats(queues, 0, 0, 0, 0, 0);
+ }
+
+ @Test
public void testStripedBlockPriorities() throws Throwable {
int dataBlkNum = ecPolicy.getNumDataUnits();
int parityBlkNUm = ecPolicy.getNumParityUnits();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org