Skip to content

8270873: JFR: Catch DirectoryIteratorException when scanning for .jfr files #5507

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

Closed
egahlin wants to merge 1 commit into from
Closed

8270873: JFR: Catch DirectoryIteratorException when scanning for .jfr files #5507

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
14 changes: 7 additions & 7 deletions src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/RepositoryFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
package jdk.jfr.internal.consumer;

import java.io.IOException;
import java.nio.file.DirectoryIteratorException;
import java.nio.file.DirectoryStream;
import java.nio.file.Path;
import java.nio.file.attribute.FileTime;
Expand Down Expand Up @@ -100,12 +101,11 @@ private boolean updatePaths(boolean wait) {
if (updatePaths()) {
break;
}
} catch (IOException e) {
Logger.log(LogTag.JFR_SYSTEM_STREAMING, LogLevel.DEBUG, "IOException during repository file scan " + e.getMessage());
} catch (IOException | DirectoryIteratorException e) {
Logger.log(LogTag.JFR_SYSTEM_STREAMING, LogLevel.DEBUG, "Exception during repository file scan " + e.getMessage());
// This can happen if a chunk is being removed
// between the file was discovered and an instance
// was accessed, or if new file has been written yet
// Just ignore, and retry later.
// was accessed. Just ignore, and retry later.
}
if (wait) {
nap();
Expand All @@ -131,7 +131,7 @@ public Path nextPath(long startTimeNanos, boolean wait) {
// Update paths
try {
updatePaths();
} catch (IOException e) {
} catch (IOException | DirectoryIteratorException e) {
// ignore
}
// try to get the next file
Expand Down Expand Up @@ -167,7 +167,7 @@ private void nap() {
}
}

private boolean updatePaths() throws IOException {
private boolean updatePaths() throws IOException, DirectoryIteratorException {
boolean foundNew = false;
Path repoPath = repository;

Expand Down Expand Up @@ -254,7 +254,7 @@ private Path findSubDirectory(Path repoPath) {
}
}
}
} catch (IOException e) {
} catch (IOException | DirectoryIteratorException e) {
// Ignore
}
return latestPath;
Expand Down