From 9c26c28c8789c3f37a8ed62a73b15dcc19f00c3e Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Tue, 2 Apr 2013 17:49:58 +0000 Subject: [PATCH] HDFS-4658. Standby NN will log that it has received a block report "after becoming active". Contributed by Aaron T. Myers. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463643 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/blockmanagement/BlockManager.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index f63c83b495..6a6fcb5c05 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -465,6 +465,9 @@ Release 2.0.5-beta - UNRELEASED HDFS-4656. DN heartbeat loop can be briefly tight. (atm) + HDFS-4658. Standby NN will log that it has received a block report "after + becoming active" (atm) + Release 2.0.4-alpha - UNRELEASED INCOMPATIBLE CHANGES 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 8a22c55f38..1caf18a3cb 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 @@ -1569,8 +1569,8 @@ public void processReport(final DatanodeID nodeID, final String poolId, node.receivedBlockReport(); if (staleBefore && !node.areBlockContentsStale()) { LOG.info("BLOCK* processReport: Received first block report from " - + node + " after becoming active. Its block contents are no longer" - + " considered stale"); + + node + " after starting up or becoming active. Its block " + + "contents are no longer considered stale"); rescanPostponedMisreplicatedBlocks(); }