Skip to content

Fix the temp location manager on J9 #8002

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
jbachorik merged 2 commits into from
Nov 25, 2024
Merged

Fix the temp location manager on J9 #8002

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
124c3b5
Fix the temp location manager on J9
jbachorik Nov 22, 2024
ec5b89d
Improve condition readability
jbachorik Nov 25, 2024
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
4 changes: 2 additions & 2 deletions ...filing-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private class CleanupVisitor implements FileVisitor<Path> {
private final Instant cutoff;
private final Instant timeoutTarget;

private boolean terminated;
private boolean terminated = false;

CleanupVisitor(boolean cleanSelf, long timeout, TimeUnit unit) {
this.cleanSelf = cleanSelf;
Expand Down Expand Up @@ -107,7 +107,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
// the JFR repository directories are under <basedir>/pid_<pid>
String pid = fileName.startsWith("pid_") ? fileName.substring(4) : null;
boolean isSelfPid = pid != null && pid.equals(PidHelper.getPid());
shouldClean |= (cleanSelf && isSelfPid) || (!cleanSelf && !pidSet.contains(pid));
shouldClean |= cleanSelf ? isSelfPid : !isSelfPid && !pidSet.contains(pid);
if (shouldClean) {
log.debug("Cleaning temporary location {}", dir);
}
Expand Down
Loading