diff options
author | Harald Musum <musum@yahooinc.com> | 2022-12-15 11:24:57 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-12-15 11:24:57 +0100 |
commit | 664d983f605acdf7c52ad9ca133d0f214bd8de01 (patch) | |
tree | c0f506cd512e92d8e55db0273283d05ec8d12e90 /configserver | |
parent | 14f64e2a1319ce1a606c16f67af76645494574b0 (diff) |
Fix logic for when to delete file references
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java index 7530d651f19..28ad003a2d6 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java @@ -127,13 +127,13 @@ public class FileDirectory extends AbstractComponent { return addFile(source, fileReference, hash); } - public void delete(FileReference fileReference, Function<FileReference, Boolean> canBeDeleted) { + public void delete(FileReference fileReference, Function<FileReference, Boolean> isInUse) { if (useLock.value()) try (Lock lock = locks.lock(fileReference)) { - if (canBeDeleted.apply(fileReference)) - deleteDirRecursively(destinationDir(fileReference)); - else + if (isInUse.apply(fileReference)) log.log(Level.FINE, "Unable to delete file reference '" + fileReference.value() + "' since it is still in use"); + else + deleteDirRecursively(destinationDir(fileReference)); } else deleteDirRecursively(destinationDir(fileReference)); |