Skip to content

Commit da688c2

Browse files
committed
Add changelog entry, fix log usage
1 parent a659c7f commit da688c2

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

docs/CHANGELOG.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ Fail snapshot operations early when creating or deleting a snapshot on a reposit
113113
written to by an older Elasticsearch after writing to it with a newer Elasticsearch version. ({pull}30140[#30140])
114114

115115
Fix NPE when CumulativeSum agg encounters null value/empty bucket ({pull}29641[#29641])
116+
Do not fail snapshot when deleting a missing snapshotted file ({pull}30332[#30332])
116117

117118
//[float]
118119
//=== Regressions

server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,8 @@ protected void finalize(final List<SnapshotFiles> snapshots,
961961
try {
962962
blobContainer.deleteBlobIgnoringIfNotExists(blobName);
963963
} catch (IOException e) {
964-
logger.warn("[{}][{}] failed to delete index blob [{}] during finalization", snapshotId, shardId, blobName, e);
964+
logger.warn(() -> new ParameterizedMessage("[{}][{}] failed to delete index blob [{}] during finalization",
965+
snapshotId, shardId, blobName), e);
965966
throw e;
966967
}
967968
}
@@ -973,7 +974,8 @@ protected void finalize(final List<SnapshotFiles> snapshots,
973974
try {
974975
blobContainer.deleteBlobIgnoringIfNotExists(blobName);
975976
} catch (IOException e) {
976-
logger.warn("[{}][{}] failed to delete data blob [{}] during finalization", snapshotId, shardId, blobName, e);
977+
logger.warn(() -> new ParameterizedMessage("[{}][{}] failed to delete data blob [{}] during finalization",
978+
snapshotId, shardId, blobName), e);
977979
}
978980
}
979981
}

0 commit comments

Comments
 (0)