Skip to content

Remove Mostly Redundant Deleting in FsBlobContainer #60117

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 3 commits into from
Jul 27, 2020
Merged

Remove Mostly Redundant Deleting in FsBlobContainer #60117

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae02b59
Remove Redundant Deleting in FsBlobContainer
original-brownbear Jul 23, 2020
f21276a
Merge remote-tracking branch 'elastic/master' into faster-fs-repo-write
original-brownbear Jul 27, 2020
3d1c745
CR: unwrap redundant else
original-brownbear Jul 27, 2020
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
11 changes: 8 additions & 3 deletions server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,16 @@ public long readBlobPreferredLength() {

@Override
public void writeBlob(String blobName, InputStream inputStream, long blobSize, boolean failIfAlreadyExists) throws IOException {
if (failIfAlreadyExists == false) {
final Path file = path.resolve(blobName);
try {
writeToPath(inputStream, file, blobSize);
} catch (FileAlreadyExistsException faee) {
if (failIfAlreadyExists) {
throw faee;
}
deleteBlobsIgnoringIfNotExists(Collections.singletonList(blobName));
writeToPath(inputStream, file, blobSize);
}
final Path file = path.resolve(blobName);
writeToPath(inputStream, file, blobSize);
IOUtils.fsync(path, true);
}

Expand Down