Repository: hadoop Updated Branches: refs/heads/trunk e5f2eedcb -> 023b941e3
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/trunk Commit: 023b941e3b83f32bc785240dbb1bfce11a987941 Parents: e5f2eed Author: Yiqun Lin <yq...@apache.org> Authored: Tue Mar 14 17:49:48 2017 +0800 Committer: Yiqun Lin <yq...@apache.org> 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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
