Skip to content

FileWatchingService should not throw for missing file #126264

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
merged 5 commits into from
Apr 7, 2025
Merged

FileWatchingService should not throw for missing file #126264

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bad2d7e
FileWatchingService shoudld not throw for missing file
ywangd Apr 4, 2025
c55b825
Update docs/changelog/126264.yaml
ywangd Apr 4, 2025
269cd5a
Merge branch 'main' into do-not-throw-on-missing-file
elasticmachine Apr 4, 2025
206b01a
Merge branch 'main' into do-not-throw-on-missing-file
elasticmachine Apr 7, 2025
7c4348e
Merge branch 'main' into do-not-throw-on-missing-file
elasticmachine Apr 7, 2025
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
5 changes: 5 additions & 0 deletions docs/changelog/126264.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 126264
summary: '`FileWatchingService` shoudld not throw for missing file'
area: Infra/Settings
type: enhancement
issues: []
6 changes: 2 additions & 4 deletions server/src/main/java/org/elasticsearch/common/file/AbstractFileWatchingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,13 @@ public final boolean watching() {
}

private FileUpdateState readFileUpdateState(Path path) throws IOException {
BasicFileAttributes attr;
try {
attr = filesReadAttributes(path, BasicFileAttributes.class);
BasicFileAttributes attr = filesReadAttributes(path, BasicFileAttributes.class);
return new FileUpdateState(attr.lastModifiedTime().toMillis(), path.toRealPath().toString(), attr.fileKey());
Copy link
Member Author

@ywangd ywangd Apr 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

path.toRealPath() can also throw NoSuchFileException and lead to failure like this one. So moving it inside the try-catch.

} catch (NoSuchFileException e) {
// file doesn't exist anymore
return null;
}

return new FileUpdateState(attr.lastModifiedTime().toMillis(), path.toRealPath().toString(), attr.fileKey());
}

// platform independent way to tell if a file changed
Expand Down
Loading