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 5b22dc6aced HDFS-16909. Improve ReplicaMap#mergeAll method. (#5353).
Contributed by ZhangHB.
5b22dc6aced is described below
commit 5b22dc6aced7e9ffdf2ab32726f0e13de28ed5bc
Author: hfutatzhanghb <1036798...@qq.com>
AuthorDate: Sun May 21 19:08:58 2023 +0800
HDFS-16909. Improve ReplicaMap#mergeAll method. (#5353). Contributed by
ZhangHB.
Reviewed-by: zhangshuyan <zqingc...@gmail.com>
Signed-off-by: He Xiaoqiao <hexiaoq...@apache.org>
---
.../hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java
index 6ecc48a95fd..e80df932b1e 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java
@@ -178,13 +178,13 @@ class ReplicaMap {
for (ReplicaInfo replicaInfo : replicaInfos) {
replicaSet.add(replicaInfo);
}
+ if (curSet == null && !replicaSet.isEmpty()) {
+ // Add an entry for block pool if it does not exist already
+ curSet = new LightWeightResizableGSet<>();
+ map.put(bp, curSet);
+ }
for (ReplicaInfo replicaInfo : replicaSet) {
checkBlock(replicaInfo);
- if (curSet == null) {
- // Add an entry for block pool if it does not exist already
- curSet = new LightWeightResizableGSet<>();
- map.put(bp, curSet);
- }
curSet.put(replicaInfo);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
