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 70E90200C3A for ; Fri, 17 Mar 2017 03:37:05 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6F991160B93; Fri, 17 Mar 2017 02:37:05 +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 C426C160B8B for ; Fri, 17 Mar 2017 03:37:04 +0100 (CET) Received: (qmail 33420 invoked by uid 500); 17 Mar 2017 02:36:55 -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 29517 invoked by uid 99); 17 Mar 2017 02:36: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; Fri, 17 Mar 2017 02:36:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3BD2AF4B65; Fri, 17 Mar 2017 02:36:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: inigoiri@apache.org To: common-commits@hadoop.apache.org Date: Fri, 17 Mar 2017 02:37:17 -0000 Message-Id: <4f05aa2de0e44e39a8a27c2b76118ee9@git.apache.org> In-Reply-To: <9a97be96828649c9943f572b15ef32de@git.apache.org> References: <9a97be96828649c9943f572b15ef32de@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [27/50] [abbrv] hadoop git commit: HDFS-11526. Fix confusing block recovery message. Contributed by Yiqun Lin. archived-at: Fri, 17 Mar 2017 02:37:05 -0000 HDFS-11526. Fix confusing block recovery message. Contributed by Yiqun Lin. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/023b941e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/023b941e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/023b941e Branch: refs/heads/HDFS-10467 Commit: 023b941e3b83f32bc785240dbb1bfce11a987941 Parents: e5f2eed Author: Yiqun Lin Authored: Tue Mar 14 17:49:48 2017 +0800 Committer: Yiqun Lin Committed: Tue Mar 14 17:49:48 2017 +0800 ---------------------------------------------------------------------- .../hadoop/hdfs/server/datanode/BlockRecoveryWorker.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/023b941e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java index d39d050..792b6af 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockRecoveryWorker.java @@ -167,9 +167,8 @@ public class BlockRecoveryWorker { return; } catch (IOException e) { ++errorCount; - InterDatanodeProtocol.LOG.warn( - "Failed to obtain replica info for block (=" + block - + ") from datanode (=" + id + ")", e); + InterDatanodeProtocol.LOG.warn("Failed to recover block (block=" + + block + ", datanode=" + id + ")", e); } } @@ -429,9 +428,8 @@ public class BlockRecoveryWorker { + rBlock.getNewGenerationStamp() + " is aborted.", ripE); return; } catch (IOException e) { - InterDatanodeProtocol.LOG.warn( - "Failed to obtain replica info for block (=" + block - + ") from datanode (=" + id + ")", e); + InterDatanodeProtocol.LOG.warn("Failed to recover block (block=" + + block + ", datanode=" + id + ")", e); } } checkLocations(syncBlocks.size()); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org