Skip to content

OAK-11560 do not delete already present segments #2143

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
joerghoh wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

OAK-11560 do not delete already present segments #2143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15b46e2
OAK-11560 do not delete already present segments
joerghoh Mar 6, 2025
c10ce8d
OAK-11560 rename method, make configuration private
joerghoh Mar 11, 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
35 changes: 27 additions & 8 deletions ...in/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/PersistentDiskCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.nio.file.AtomicMoveNotSupportedException;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
Expand All @@ -59,6 +60,8 @@ public class PersistentDiskCache extends AbstractPersistentCache {
public static final long DEFAULT_TEMP_FILES_CLEANUP_WAIT_TIME_MS = 60000;
private static final String TEMP_FILE_SUFFIX = ".part";

private static boolean DELETE_SEGMENT_ON_REFETCH = Boolean.getBoolean("oak.segment.cache.delete_segment_on_refetch");

private final File directory;
private final long maxCacheSizeBytes;
private final DiskCacheIOMonitor diskCacheIOMonitor;
Expand Down Expand Up @@ -121,7 +124,7 @@ protected Buffer readSegmentInternal(long msb, long lsb) {

return buffer;
} catch (FileNotFoundException e) {
logger.info("Segment {} deleted from file system!", segmentId);
logger.info("Segment {} no longer available, refetching", segmentId);
} catch (IOException e) {
logger.error("Error loading segment {} from cache:", segmentId, e);
}
Expand Down Expand Up @@ -160,14 +163,20 @@ public void writeSegment(long msb, long lsb, Buffer buffer) {
}
long cacheSizeAfter = cacheSize.addAndGet(fileSize);
diskCacheIOMonitor.updateCacheSize(cacheSizeAfter, fileSize);
} catch (Exception e) {
logger.error("Error writing segment {} to cache", segmentId, e);
try {
Files.deleteIfExists(segmentFile.toPath());
Files.deleteIfExists(tempSegmentFile.toPath());
} catch (IOException i) {
logger.error("Error while deleting corrupted segment file {}", segmentId, i);
} catch (FileAlreadyExistsException faee) {
if (DELETE_SEGMENT_ON_REFETCH) {
deleteSegmentAndTempSegment(segmentId, segmentFile, tempSegmentFile, faee);
} else {
// just delete the temp file, as the target segment file is already there and valid
try {
logger.debug("Skipping already existing file {}", segmentId);
Files.deleteIfExists(tempSegmentFile.toPath());
} catch (IOException e) {
logger.debug("Cannot delete temporary file {}", tempSegmentFile.toPath(),e);
}
}
} catch (Exception e) {
deleteSegmentAndTempSegment(segmentId, segmentFile, tempSegmentFile, e);
} finally {
writesPending.remove(segmentId);
}
Expand All @@ -178,6 +187,16 @@ public void writeSegment(long msb, long lsb, Buffer buffer) {
executor.execute(task);
}

private void deleteSegmentAndTempSegment(String segmentId, File segmentFile, File tempSegmentFile, Exception e) {
logger.error("Error writing segment {} to cache", segmentId, e);
try {
Files.deleteIfExists(segmentFile.toPath());
Files.deleteIfExists(tempSegmentFile.toPath());
} catch (IOException i) {
logger.error("Error while deleting corrupted segment file {}", segmentId, i);
}
}

private boolean isCacheFull() {
return cacheSize.get() >= maxCacheSizeBytes;
}
Expand Down
Loading