This is an automated email from the ASF dual-hosted git repository.
Hexiaoqiao 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 ca28186c140 HDFS-17931. Add early return in
PendingDataNodeMessages.removeQueuedBlock when queue is empty. (#8529).
Contributed by Janus Chow.
ca28186c140 is described below
commit ca28186c140505bc9a7c08db0478774d833c3948
Author: Symious <[email protected]>
AuthorDate: Tue Jul 14 12:43:14 2026 +0800
HDFS-17931. Add early return in PendingDataNodeMessages.removeQueuedBlock
when queue is empty. (#8529). Contributed by Janus Chow.
Reviewed-by: Zengqiang Xu <[email protected]>
Signed-off-by: He Xiaoqiao <[email protected]>
---
.../org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java | 4 ++--
.../hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java | 2 +-
2 files changed, 3 insertions(+), 3 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 e7907294380..962b62560c8 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
@@ -3525,8 +3525,8 @@ private void queueReportedBlock(DatanodeStorageInfo
storageInfo, Block block,
* standby node. @see PendingDataNodeMessages.
*/
private void removeQueuedBlock(DatanodeStorageInfo storageInfo, Block block)
{
- LOG.debug("Removing queued block {} from datanode {} from pending queue.",
- block, storageInfo.getDatanodeDescriptor());
+ LOG.debug("Removing queued block {} from datanode {} from pending queue
(size = {}).",
+ block, storageInfo.getDatanodeDescriptor(), pendingDNMessages.count());
pendingDNMessages.removeQueuedBlock(storageInfo, block);
}
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java
index 05e9ce49bf1..fc0d4e08156 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/PendingDataNodeMessages.java
@@ -109,7 +109,7 @@ void enqueueReportedBlock(DatanodeStorageInfo storageInfo,
Block block,
}
void removeQueuedBlock(DatanodeStorageInfo storageInfo, Block block) {
- if (storageInfo == null || block == null) {
+ if (count <= 0 || storageInfo == null || block == null) {
return;
}
Block blk = new Block(block);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
