You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by so...@apache.org on 2021/02/24 10:52:10 UTC
[hadoop] branch trunk updated: HDFS-15422. Reported IBR is
partially replaced with stored info when queuing. Contributed by Stephen
O'Donnell and Kihwal Lee
This is an automated email from the ASF dual-hosted git repository.
sodonnell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9c583f3 HDFS-15422. Reported IBR is partially replaced with stored info when queuing. Contributed by Stephen O'Donnell and Kihwal Lee
9c583f3 is described below
commit 9c583f36d5d0024ab052429ef2f0c0b20e1ea258
Author: S O'Donnell <so...@cloudera.com>
AuthorDate: Wed Feb 24 10:29:36 2021 +0000
HDFS-15422. Reported IBR is partially replaced with stored info when queuing. Contributed by Stephen O'Donnell and Kihwal Lee
---
.../hdfs/server/blockmanagement/BlockManager.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
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 d612fff..fdf300f 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
@@ -3211,10 +3211,11 @@ public class BlockManager implements BlockStatsMXBean {
// If the block is an out-of-date generation stamp or state,
// but we're the standby, we shouldn't treat it as corrupt,
// but instead just queue it for later processing.
- // TODO: Pretty confident this should be s/storedBlock/block below,
- // since we should be postponing the info of the reported block, not
- // the stored block. See HDFS-6289 for more context.
- queueReportedBlock(storageInfo, storedBlock, reportedState,
+ // Storing the reported block for later processing, as that is what
+ // comes from the IBR / FBR and hence what we should use to compare
+ // against the memory state.
+ // See HDFS-6289 and HDFS-15422 for more context.
+ queueReportedBlock(storageInfo, replica, reportedState,
QUEUE_REASON_CORRUPT_STATE);
} else {
toCorrupt.add(c);
@@ -4276,10 +4277,11 @@ public class BlockManager implements BlockStatsMXBean {
// If the block is an out-of-date generation stamp or state,
// but we're the standby, we shouldn't treat it as corrupt,
// but instead just queue it for later processing.
- // TODO: Pretty confident this should be s/storedBlock/block below,
- // since we should be postponing the info of the reported block, not
- // the stored block. See HDFS-6289 for more context.
- queueReportedBlock(storageInfo, storedBlock, reportedState,
+ // Storing the reported block for later processing, as that is what
+ // comes from the IBR / FBR and hence what we should use to compare
+ // against the memory state.
+ // See HDFS-6289 and HDFS-15422 for more context.
+ queueReportedBlock(storageInfo, block, reportedState,
QUEUE_REASON_CORRUPT_STATE);
} else {
markBlockAsCorrupt(c, storageInfo, node);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org