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 ki...@apache.org on 2017/06/20 14:25:26 UTC
hadoop git commit: Revert "HDFS-11960. Successfully closed files can
stay under-replicated. Contributed by Kihwal Lee."
Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 40e3cd24b -> 1f9255672
Revert "HDFS-11960. Successfully closed files can stay under-replicated. Contributed by Kihwal Lee."
This reverts commit 40e3cd24b068d08be8cf05668290b908f6b43c11.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1f925567
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1f925567
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1f925567
Branch: refs/heads/branch-2.8
Commit: 1f9255672d8da244dcc6910530e7b325833fed99
Parents: 40e3cd2
Author: Kihwal Lee <ki...@apache.org>
Authored: Tue Jun 20 09:22:25 2017 -0500
Committer: Kihwal Lee <ki...@apache.org>
Committed: Tue Jun 20 09:22:25 2017 -0500
----------------------------------------------------------------------
.../server/blockmanagement/BlockManager.java | 5 +--
.../blockmanagement/TestPendingReplication.java | 45 --------------------
2 files changed, 2 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f925567/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index b491f61..ed00cd1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -3237,9 +3237,8 @@ public class BlockManager implements BlockStatsMXBean {
// Modify the blocks->datanode map and node's map.
//
BlockInfo storedBlock = getStoredBlock(block);
- if (storedBlock != null &&
- block.getGenerationStamp() == storedBlock.getGenerationStamp()) {
- pendingReplications.decrement(storedBlock, node);
+ if (storedBlock != null) {
+ pendingReplications.decrement(getStoredBlock(block), node);
}
processAndHandleReportedBlock(storageInfo, block, ReplicaState.FINALIZED,
delHintNode);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1f925567/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingReplication.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingReplication.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingReplication.java
index b77dbc7..afda6e8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingReplication.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingReplication.java
@@ -209,8 +209,6 @@ public class TestPendingReplication {
// Place into blocksmap with GenerationStamp = 1
blockInfo.setGenerationStamp(1);
blocksMap.addBlockCollection(blockInfo, bc);
- //Save it for later.
- BlockInfo storedBlock = blockInfo;
assertEquals("Size of pendingReplications ", 1,
pendingReplications.size());
@@ -257,49 +255,6 @@ public class TestPendingReplication {
// Verify size of neededReplications is exactly 1.
assertEquals("size of neededReplications is 1 ", 1,
neededReplications.size());
-
- // Verify HDFS-11960
- // Stop the replication/redundancy monitor
- BlockManagerTestUtil.stopReplicationThread(blkManager);
- pendingReplications.clear();
- // Pick a real node
- DatanodeDescriptor desc[] = { blkManager.getDatanodeManager().
- getDatanodes().iterator().next() };
-
- // Add a stored block to the pendingReconstruction.
- pendingReplications.increment(storedBlock, desc);
- assertEquals("Size of pendingReplications ", 1,
- pendingReplications.size());
-
- // A received IBR processing calls addBlock(). If the gen stamp in the
- // report is not the same, it should stay in pending.
- fsn.writeLock();
- try {
- // Use a wrong gen stamp.
- blkManager.addBlock(desc[0].getStorageInfos()[0],
- new Block(1, 1, 0), null);
- } finally {
- fsn.writeUnlock();
- }
-
- // The block should still be pending
- assertEquals("Size of pendingReplications ", 1,
- pendingReplications.size());
-
- // A block report with the correct gen stamp should remove the record
- // from the pending queue.
- fsn.writeLock();
- try {
- blkManager.addBlock(desc[0].getStorageInfos()[0],
- new Block(1, 1, 1), null);
- } finally {
- fsn.writeUnlock();
- }
-
- // The pending queue should be empty.
- assertEquals("Size of pendingReplications ", 0,
- pendingReplications.size());
-
} finally {
if (cluster != null) {
cluster.shutdown();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org