Skip to content

Commit 54a0786

Browse files
author
shun01.ding
committed
HDFS-16855. Remove the redundant write lock in addBlockPool. Contributed by DingShun.
1 parent 1a7acc4 commit 54a0786

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

  • hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3187,17 +3187,15 @@ public void addBlockPool(String bpid, Configuration conf)
31873187
throws IOException {
31883188
LOG.info("Adding block pool " + bpid);
31893189
AddBlockPoolException volumeExceptions = new AddBlockPoolException();
3190-
try (AutoCloseableLock lock = lockManager.writeLock(LockLevel.BLOCK_POOl, bpid)) {
3191-
try {
3192-
volumes.addBlockPool(bpid, conf);
3193-
} catch (AddBlockPoolException e) {
3194-
volumeExceptions.mergeException(e);
3195-
}
3196-
volumeMap.initBlockPool(bpid);
3197-
Set<String> vols = storageMap.keySet();
3198-
for (String v : vols) {
3199-
lockManager.addLock(LockLevel.VOLUME, bpid, v);
3200-
}
3190+
try {
3191+
volumes.addBlockPool(bpid, conf);
3192+
} catch (AddBlockPoolException e) {
3193+
volumeExceptions.mergeException(e);
3194+
}
3195+
volumeMap.initBlockPool(bpid);
3196+
Set<String> vols = storageMap.keySet();
3197+
for (String v : vols) {
3198+
lockManager.addLock(LockLevel.VOLUME, bpid, v);
32013199
}
32023200
try {
32033201
volumes.getAllVolumesMap(bpid, volumeMap, ramDiskReplicaTracker);

0 commit comments

Comments
 (0)