Skip to content

Fix DirectoryChecker.deregisterAll to close/delete all lock resources #17267

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

Open
iamsanjaymalakar wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −5
Open

Fix DirectoryChecker.deregisterAll to close/delete all lock resources #17267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 21 additions & 5 deletions ...atanode/src/main/java/org/apache/iotdb/db/storageengine/rescon/disk/DirectoryChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,32 @@ private Path mountOf(Path p) throws IOException {
}

public void deregisterAll() {
try {
for (RandomAccessFile randomAccessFile : randomAccessFileList) {
IOException first = null;
for (RandomAccessFile randomAccessFile : randomAccessFileList) {
try {
randomAccessFile.close();
// it will release lock automatically after close
} catch (IOException e) {
if (first == null) {
first = e;
} else {
first.addSuppressed(e);
}
}
for (File file : fileList) {
}
for (File file : fileList) {
try {
FileUtils.delete(file);
} catch (IOException e) {
if (first == null) {
first = e;
} else {
first.addSuppressed(e);
}
}
} catch (IOException e) {
logger.warn("Failed to deregister file lock because {}", e.getMessage(), e);
}
if (first != null) {
logger.warn("Failed to deregister one or more file locks: {}", e.getMessage(), e);
}
}

Expand Down