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/11/03 20:17:38 UTC
hadoop git commit: HDFS-12771. Add genstamp and block size to
metasave Corrupt blocks list. Contributed by Kuhu Shukla.
Repository: hadoop
Updated Branches:
refs/heads/trunk 299d38295 -> 4d2dce40b
HDFS-12771. Add genstamp and block size to metasave Corrupt blocks list. Contributed by Kuhu Shukla.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4d2dce40
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4d2dce40
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4d2dce40
Branch: refs/heads/trunk
Commit: 4d2dce40bbe5242953774e6a2fc0dc9111cf5ed0
Parents: 299d382
Author: Kihwal Lee <ki...@apache.org>
Authored: Fri Nov 3 15:16:46 2017 -0500
Committer: Kihwal Lee <ki...@apache.org>
Committed: Fri Nov 3 15:16:46 2017 -0500
----------------------------------------------------------------------
.../hadoop/hdfs/server/blockmanagement/BlockManager.java | 9 +++++----
.../hdfs/server/blockmanagement/TestBlockManager.java | 5 +++--
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4d2dce40/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 6cd67f6..bdabd81 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
@@ -775,10 +775,11 @@ public class BlockManager implements BlockStatsMXBean {
String storageId = storage.getStorageID();
DatanodeStorageInfo storageInfo = node.getStorageInfo(storageId);
State state = (storageInfo == null) ? null : storageInfo.getState();
- out.println("Block=" + block.getBlockId() + "\tNode=" + node.getName()
- + "\tStorageID=" + storageId + "\tStorageState=" + state
- + "\tTotalReplicas=" +
- blocksMap.numNodes(block)
+ out.println("Block=" + block.toString()
+ + "\tSize=" + block.getNumBytes()
+ + "\tNode=" + node.getName() + "\tStorageID=" + storageId
+ + "\tStorageState=" + state
+ + "\tTotalReplicas=" + blocksMap.numNodes(block)
+ "\tReason=" + corruptReplicas.getCorruptReason(block, node));
numNodesToFind--;
if (numNodesToFind == 0) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4d2dce40/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
index 4d01d80..f63be91 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
@@ -1318,8 +1318,9 @@ public class TestBlockManager {
assertTrue("Unexpected text in metasave," +
"was expecting corrupt blocks section!", foundIt);
corruptBlocksLine = reader.readLine();
- String regex = "Block=[0-9]+\\tNode=.*\\tStorageID=.*StorageState.*" +
- "TotalReplicas=.*Reason=GENSTAMP_MISMATCH";
+ String regex = "Block=blk_[0-9]+_[0-9]+\\tSize=.*\\tNode=.*" +
+ "\\tStorageID=.*\\tStorageState.*" +
+ "\\tTotalReplicas=.*\\tReason=GENSTAMP_MISMATCH";
assertTrue("Unexpected corrupt block section in metasave!",
corruptBlocksLine.matches(regex));
corruptBlocksLine = reader.readLine();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org