Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 471AB200B76 for ; Tue, 30 Aug 2016 17:10:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4146F160ACC; Tue, 30 Aug 2016 15:10:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 884DC160AAF for ; Tue, 30 Aug 2016 17:09:59 +0200 (CEST) Received: (qmail 93749 invoked by uid 500); 30 Aug 2016 15:08:52 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 93471 invoked by uid 99); 30 Aug 2016 15:08:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Aug 2016 15:08:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0CEA3E0BDC; Tue, 30 Aug 2016 15:08:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aw@apache.org To: common-commits@hadoop.apache.org Date: Tue, 30 Aug 2016 15:08:58 -0000 Message-Id: In-Reply-To: <57367f60fccf4d749d525e41566f8e71@git.apache.org> References: <57367f60fccf4d749d525e41566f8e71@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/16] hadoop git commit: HDFS-10625. VolumeScanner to report why a block is found bad. Contributed by Rushabh S Shah and Yiqun Lin. archived-at: Tue, 30 Aug 2016 15:10:05 -0000 HDFS-10625. VolumeScanner to report why a block is found bad. Contributed by Rushabh S Shah and Yiqun Lin. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5d1609dd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5d1609dd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5d1609dd Branch: refs/heads/HADOOP-13341 Commit: 5d1609ddf275e4907bd224bf618e2aad4b262888 Parents: 6fcb04c Author: Yongjun Zhang Authored: Mon Aug 29 13:58:05 2016 -0700 Committer: Yongjun Zhang Committed: Mon Aug 29 13:59:54 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/5d1609dd/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 7c3d778..9d9502b 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 @@ -156,6 +156,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; @@ -238,7 +241,6 @@ class BlockSender implements java.io.Closeable { "If verifying checksum, currently must also send it."); } - final Replica replica; final long replicaVisibleLength; try(AutoCloseableLock lock = datanode.data.acquireDatasetLock()) { replica = getReplica(block, datanode); @@ -688,8 +690,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/5d1609dd/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 7a9ecf2..3416b53 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 @@ -281,12 +281,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, volume); } 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: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org