Skip to content

Commit f307f49

Browse files
committed
HDFS-17705. Improve datasetlock related log output.
1 parent 94d6a77 commit f307f49

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataSetLockManager.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public AutoCloseDataSetLock readLock(LockLevel level, String... resources) {
176176
AutoCloseDataSetLock dirLock = getReadLock(level, resources);
177177
dirLock.setParentLock(volLock);
178178
if (openLockTrace) {
179-
LOG.debug("Sub lock " + resources[0] + resources[1] + resources[2] + " parent lock " +
179+
LOG.info("Sub lock " + resources[0] + resources[1] + resources[2] + " parent lock " +
180180
resources[0] + resources[1]);
181181
}
182182
return dirLock;
@@ -203,7 +203,7 @@ public AutoCloseDataSetLock writeLock(LockLevel level, String... resources) {
203203
AutoCloseDataSetLock dirLock = getWriteLock(level, resources);
204204
dirLock.setParentLock(volLock);
205205
if (openLockTrace) {
206-
LOG.debug("Sub lock " + resources[0] + resources[1] + resources[2] + " parent lock " +
206+
LOG.info("Sub lock " + resources[0] + resources[1] + resources[2] + " parent lock " +
207207
resources[0] + resources[1]);
208208
}
209209
return dirLock;
@@ -262,6 +262,9 @@ public void addLock(LockLevel level, String... resources) {
262262
new ReentrantReadWriteLock(isFair));
263263
lockMap.addLock(lockName, new ReentrantReadWriteLock(isFair));
264264
}
265+
if (openLockTrace) {
266+
LOG.info("Added {} lock, lock name: {}", level.name(), lockName);
267+
}
265268
}
266269

267270
@Override
@@ -270,6 +273,9 @@ public void removeLock(LockLevel level, String... resources) {
270273
try (AutoCloseDataSetLock lock = writeLock(level, resources)) {
271274
lockMap.removeLock(lockName);
272275
}
276+
if (openLockTrace) {
277+
LOG.info("Removed {} lock, lock name: {}", level.name(), lockName);
278+
}
273279
}
274280

275281
@Override

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,6 @@ private synchronized void activateVolume(
442442
List<String> allSubDirNameForDataSetLock = datasetSubLockStrategy.getAllSubLockName();
443443
for (String dir : allSubDirNameForDataSetLock) {
444444
lockManager.addLock(LockLevel.DIR, bp, ref.getVolume().getStorageID(), dir);
445-
LOG.info("Added DIR lock for bpid:{}, volume storageid:{}, dir:{}",
446-
bp, ref.getVolume().getStorageID(), dir);
447445
}
448446
}
449447
DatanodeStorage dnStorage = storageMap.get(sd.getStorageUuid());
@@ -647,8 +645,6 @@ public void removeVolumes(
647645
List<String> allSubDirNameForDataSetLock = datasetSubLockStrategy.getAllSubLockName();
648646
for (String dir : allSubDirNameForDataSetLock) {
649647
lockManager.removeLock(LockLevel.DIR, bp, storageUuid, dir);
650-
LOG.info("Removed DIR lock for bpid:{}, volume storageid:{}, dir:{}",
651-
bp, storageUuid, dir);
652648
}
653649
lockManager.removeLock(LockLevel.VOLUME, bp, storageUuid);
654650
}
@@ -3300,8 +3296,6 @@ public void addBlockPool(String bpid, Configuration conf)
33003296
List<String> allSubDirNameForDataSetLock = datasetSubLockStrategy.getAllSubLockName();
33013297
for (String dir : allSubDirNameForDataSetLock) {
33023298
lockManager.addLock(LockLevel.DIR, bpid, v, dir);
3303-
LOG.info("Added DIR lock for bpid:{}, volume storageid:{}, dir:{}",
3304-
bpid, v, dir);
33053299
}
33063300
}
33073301
}

0 commit comments

Comments
 (0)