Skip to content

Fix read lock leak in disk usage statistics #18807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JackieTien97 merged 3 commits into from
Oct 9, 2026
Merged

Fix read lock leak in disk usage statistics #18807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60d63b9
Fix read lock leak in disk usage statistics
shuwenwei Oct 9, 2026
f964e15
Test read lock release after disk usage statistics
shuwenwei Oct 9, 2026
cefad09
Clarify reader reference ownership in disk usage statistics
shuwenwei Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .../main/java/org/apache/iotdb/db/storageengine/dataregion/utils/DiskUsageStatisticUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
public abstract class DiskUsageStatisticUtil implements Closeable {

protected static final Logger logger = LoggerFactory.getLogger(DiskUsageStatisticUtil.class);
// Collected files retain a reader reference and its resource read lock until released.
protected Queue<TsFileResource> resourcesWithReadLock;
protected final long timePartition;
protected final Iterator<TsFileResource> iterator;
Expand Down Expand Up @@ -100,9 +101,9 @@ protected void acquireReadLocks(List<TsFileResource> resources) {
if (!resource.isClosed()) {
continue;
}
resource.readLock();
FileReaderManager.getInstance().increaseFileReaderReference(resource, true);
if (resource.isDeleted() || !resource.isClosed()) {
resource.readUnlock();
FileReaderManager.getInstance().decreaseFileReaderReference(resource, true);
continue;
}
resourcesWithReadLock.add(resource);
Expand All @@ -118,7 +119,7 @@ protected void releaseReadLocks() {
return;
}
for (TsFileResource resource : resourcesWithReadLock) {
resource.readUnlock();
FileReaderManager.getInstance().decreaseFileReaderReference(resource, true);
}
resourcesWithReadLock = null;
}
Expand All @@ -127,10 +128,9 @@ public void calculateNextFile() {
TsFileResource tsFileResource = iterator.next();
if (tsFileResource.isDeleted() || calculateWithoutOpenFile(tsFileResource)) {
iterator.remove();
tsFileResource.readUnlock();
FileReaderManager.getInstance().decreaseFileReaderReference(tsFileResource, true);
return;
}
FileReaderManager.getInstance().increaseFileReaderReference(tsFileResource, true);
try {
TsFileSequenceReader reader =
FileReaderManager.getInstance()
Expand All @@ -146,7 +146,7 @@ public void calculateNextFile() {
tsFileResource.getTsFile().getAbsolutePath(),
e);
} finally {
// this operation including readUnlock
// Release the reader reference registered during collection, including its read lock.
FileReaderManager.getInstance().decreaseFileReaderReference(tsFileResource, true);
iterator.remove();
}
Expand Down
8 changes: 8 additions & 0 deletions .../src/test/java/org/apache/iotdb/db/storageengine/dataregion/utils/TableDiskUsageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,14 @@ public void testCalculateTableSizeFromFile() throws Exception {

DataRegionTableSizeQueryContext context = new DataRegionTableSizeQueryContext(true);
queryTableSize(context);
boolean writeLockAcquired = resource1.tryWriteLock();
try {
Assert.assertTrue("Disk usage statistics should release all read locks", writeLockAcquired);
} finally {
if (writeLockAcquired) {
resource1.writeUnlock();
}
}
Assert.assertEquals(1, context.getTimePartitionTableSizeQueryContextMap().size());
TimePartitionTableSizeQueryContext timePartitionContext =
context.getTimePartitionTableSizeQueryContextMap().values().iterator().next();
Expand Down
Loading