Skip to content

Fix sync method to account for block files in Composite Directory #18660

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 2 commits into from
Jul 15, 2025
Merged

Fix sync method to account for block files in Composite Directory #18660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a76983
Fix sync method to account for block files in Composite Directory
rayshrey Jun 30, 2025
f5d9728
Skip sync call for block file
rayshrey Jul 14, 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
14 changes: 10 additions & 4 deletions server/src/main/java/org/opensearch/index/store/CompositeDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,16 @@ public IndexOutput createOutput(String name, IOContext context) throws IOExcepti
public void sync(Collection<String> names) throws IOException {
ensureOpen();
logger.trace("Composite Directory[{}]: sync() called {}", this::toString, () -> names);
Collection<String> remoteFiles = Arrays.asList(getRemoteFiles());
Collection<String> filesToSync = names.stream().filter(name -> remoteFiles.contains(name) == false).collect(Collectors.toList());
logger.trace("Composite Directory[{}]: Synced files : {}", this::toString, () -> filesToSync);
localDirectory.sync(filesToSync);
Set<String> remoteFiles = Set.of(getRemoteFiles());
Set<String> localFilesHavingBlocks = Arrays.stream(listLocalFiles())
.filter(FileTypeUtils::isBlockFile)
.map(file -> file.substring(0, file.indexOf(BLOCK_FILE_IDENTIFIER)))
.collect(Collectors.toSet());
Collection<String> fullFilesToSync = names.stream()
.filter(name -> (remoteFiles.contains(name) == false) && (localFilesHavingBlocks.contains(name) == false))
.collect(Collectors.toList());
logger.trace("Composite Directory[{}]: Synced files : {}", this::toString, () -> fullFilesToSync);
localDirectory.sync(fullFilesToSync);
}

/**
Expand Down
6 changes: 6 additions & 0 deletions server/src/test/java/org/opensearch/index/store/CompositeDirectoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@ public void testSync() throws IOException {
// All the files in the below list are present either locally or on remote, so sync should work as expected
Collection<String> names = List.of("_0.cfe", "_0.cfs", "_0.si", "_1.cfe", "_2.cfe", "segments_1");
compositeDirectory.sync(names);
// Deleting file _1.cfe and then adding its blocks locally so that full file is not present but block files are present in local
// State of _1.cfe file after these operations - not present in remote, full file not present locally but blocks present in local
compositeDirectory.deleteFile("_1.cfe");
addFilesToDirectory(new String[] { "_1.cfe_block_0", "_1.cfe_block_2" });
// Sync should work as expected since blocks are present in local
compositeDirectory.sync(List.of("_1.cfe"));
// Below list contains a non-existent file, hence will throw an error
Collection<String> names1 = List.of("_0.cfe", "_0.cfs", "_0.si", "_1.cfe", "_2.cfe", "segments_1", "non_existent_file");
assertThrows(NoSuchFileException.class, () -> compositeDirectory.sync(names1));
Expand Down
Loading