Skip to content

Fix O(n^2) removeAll in remote translog metadata cleanup #21350

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
gbbafna merged 2 commits into from
Apr 27, 2026
Merged

Fix O(n^2) removeAll in remote translog metadata cleanup #21350

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b657f29
Fix O(n^2) removeAll in remote translog metadata cleanup
gbbafna Apr 24, 2026
f395fcc
Merge branch 'main' into remote-cpu-fix
Bukhtawar Apr 26, 2026
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
34 changes: 27 additions & 7 deletions server/src/main/java/org/opensearch/index/translog/RemoteFsTimestampAwareTranslog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,22 @@ public void onResponse(List<BlobMetadata> blobMetadata) {
return;
}

logger.debug(() -> "metadataFilesToBeDeleted = " + metadataFilesToBeDeleted);
logger.debug(
() -> "metadataFilesToBeDeleted count = "
+ metadataFilesToBeDeleted.size()
+ ", metadataFilesToBeDeleted = "
+ metadataFilesToBeDeleted
);
// For all the files that we are keeping, fetch min and max generations
List<String> metadataFilesNotToBeDeleted = new ArrayList<>(metadataFiles);
metadataFilesNotToBeDeleted.removeAll(metadataFilesToBeDeleted);
metadataFilesNotToBeDeleted.removeAll(new HashSet<>(metadataFilesToBeDeleted));
Comment thread
gbbafna marked this conversation as resolved.

logger.debug(() -> "metadataFilesNotToBeDeleted = " + metadataFilesNotToBeDeleted);
logger.debug(
() -> "metadataFilesNotToBeDeleted count = "
+ metadataFilesNotToBeDeleted.size()
+ ", metadataFilesNotToBeDeleted = "
+ metadataFilesNotToBeDeleted
);

Set<Long> generationsToBeDeleted = getGenerationsToBeDeleted(
metadataFilesNotToBeDeleted,
Expand Down Expand Up @@ -373,7 +383,7 @@ protected static List<String> getMetadataFilesToBeDeleted(
long maxGeneration = TranslogTransferMetadata.getMaxGenerationFromFileName(md);
return maxGeneration == -1 || maxGeneration >= minGenerationToKeepInRemote;
}).collect(Collectors.toList());
metadataFilesToBeDeleted.removeAll(metadataFilesContainingMinGenerationToKeep);
metadataFilesToBeDeleted.removeAll(new HashSet<>(metadataFilesContainingMinGenerationToKeep));

logger.trace(
"metadataFilesContainingMinGenerationToKeep.size = {}, metadataFilesToBeDeleted based on minGenerationToKeep filtering = {}, minGenerationToKeep = {}",
Expand Down Expand Up @@ -572,12 +582,22 @@ public void onResponse(List<BlobMetadata> blobMetadata) {
staticLogger.debug("No metadata files to delete");
return;
}
staticLogger.debug(() -> "metadataFilesToBeDeleted = " + metadataFilesToBeDeleted);
staticLogger.debug(
() -> "metadataFilesToBeDeleted count = "
+ metadataFilesToBeDeleted.size()
+ ", metadataFilesToBeDeleted = "
+ metadataFilesToBeDeleted
);

// For all the files that we are keeping, fetch min and max generations
List<String> metadataFilesNotToBeDeleted = new ArrayList<>(metadataFiles);
metadataFilesNotToBeDeleted.removeAll(metadataFilesToBeDeleted);
staticLogger.debug(() -> "metadataFilesNotToBeDeleted = " + metadataFilesNotToBeDeleted);
metadataFilesNotToBeDeleted.removeAll(new HashSet<>(metadataFilesToBeDeleted));
staticLogger.debug(
() -> "metadataFilesNotToBeDeleted count = "
+ metadataFilesNotToBeDeleted.size()
+ ", metadataFilesNotToBeDeleted = "
+ metadataFilesNotToBeDeleted
);

// Delete stale metadata files
translogTransferManager.deleteMetadataFilesAsync(metadataFilesToBeDeleted, () -> {});
Expand Down
Loading