checkAndUpdate use subdir lock

Author: hfutatzhanghb

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

@@ -2774,7 +2774,8 @@ public void checkAndUpdate(String bpid, ScanInfo scanInfo)
       lastDirScannerNotifyTime = startTimeMs;
     }
     String storageUuid = vol.getStorageID();
-    try (AutoCloseableLock lock = lockManager.writeLock(LockLevel.VOLUME, bpid, storageUuid)) {
+    try (AutoCloseableLock lock = lockManager.writeLock(LockLevel.DIR, bpid,
+        vol.getStorageID(), DatanodeUtil.idToBlockDirSuffixName(blockId))) {
       if (!storageMap.containsKey(storageUuid)) {
         // Storage was already removed
         return;