Repository: hadoop Updated Branches: refs/heads/branch-2.7 a852800d2 -> 4fd2adbc5
HDFS-10625. VolumeScanner to report why a block is found bad. Contributed by Rushabh S Shah and Yiqun Lin. (cherry picked from commit 5d1609ddf275e4907bd224bf618e2aad4b262888) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4fd2adbc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4fd2adbc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4fd2adbc Branch: refs/heads/branch-2.7 Commit: 4fd2adbc5f3267d00687ffd1985950420527454c Parents: a852800 Author: Yongjun Zhang <[email protected]> Authored: Mon Aug 29 13:58:05 2016 -0700 Committer: Yongjun Zhang <[email protected]> Committed: Mon Aug 29 14:25:49 2016 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/server/datanode/BlockSender.java | 12 +++++++++--- .../hadoop/hdfs/server/datanode/VolumeScanner.java | 5 +++-- 2 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fd2adbc/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java index 0cb387e..80061d3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java @@ -147,6 +147,9 @@ class BlockSender implements java.io.Closeable { /** The reference to the volume where the block is located */ private FsVolumeReference volumeRef; + /** The replica of the block that is being read. */ + private final Replica replica; + // Cache-management related fields private final long readaheadLength; @@ -229,7 +232,6 @@ class BlockSender implements java.io.Closeable { "If verifying checksum, currently must also send it."); } - final Replica replica; final long replicaVisibleLength; synchronized(datanode.data) { replica = getReplica(block, datanode); @@ -680,8 +682,12 @@ class BlockSender implements java.io.Closeable { checksum.update(buf, dOff, dLen); if (!checksum.compare(buf, cOff)) { long failedPos = offset + datalen - dLeft; - throw new ChecksumException("Checksum failed at " + failedPos, - failedPos); + StringBuilder replicaInfoString = new StringBuilder(); + if (replica != null) { + replicaInfoString.append(" for replica: " + replica.toString()); + } + throw new ChecksumException("Checksum failed at " + failedPos + + replicaInfoString, failedPos); } dLeft -= dLen; dOff += dLen; http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fd2adbc/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java index 212e13b..ad546d2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java @@ -282,12 +282,13 @@ public class VolumeScanner extends Thread { volume.getBasePath(), block); return; } - LOG.warn("Reporting bad {} on {}", block, volume.getBasePath()); + LOG.warn("Reporting bad " + block + " with volume " + + volume.getBasePath(), e); try { scanner.datanode.reportBadBlocks(block); } catch (IOException ie) { // This is bad, but not bad enough to shut down the scanner. - LOG.warn("Cannot report bad " + block.getBlockId(), e); + LOG.warn("Cannot report bad block " + block, ie); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
