Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-13962. Add null check for add-replica pool to avoid lock acquiring. Contributed by Surendra Singh Lilhore. 

(cherry picked from commit 1043795f7f)
This commit is contained in:
Yiqun Lin 2018-10-09 10:33:13 +08:00
parent 21553e22b6
commit b6698e2a82
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
View File

@ -183,8 +183,10 @@ class BlockPoolSlice {
.setConf(conf) .setConf(conf)
.setInitialUsed(loadDfsUsed()) .setInitialUsed(loadDfsUsed())
.build(); .build();
if (addReplicaThreadPool == null) {
// initialize add replica fork join pool // initialize add replica fork join pool
initializeAddReplicaPool(conf); initializeAddReplicaPool(conf);
}
// Make the dfs usage to be saved during shutdown. // Make the dfs usage to be saved during shutdown.
shutdownHook = new Runnable() { shutdownHook = new Runnable() {
@Override @Override

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java
View File

@ -154,7 +154,7 @@ class ReplicaMap {
if (oldReplicaInfo != null) { if (oldReplicaInfo != null) {
return oldReplicaInfo; return oldReplicaInfo;
} else { } else {
set.add(replicaInfo); set.addOrReplace(replicaInfo);
} }
return replicaInfo; return replicaInfo;
} }