Skip to content

Fix name of UNSAFELY_INCOMPATIBLE_WITH_S3_CONDITIONAL_WRITES #138406

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
DaveCTurner merged 2 commits into from
Nov 21, 2025
+7 −7
Merged

Fix name of UNSAFELY_INCOMPATIBLE_WITH_S3_CONDITIONAL_WRITES #138406

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
195468e
Fix name of `UNSAFELY_INCOMPATIBLE_WITH_S3_CONDITIONAL_WRITES`
DaveCTurner Nov 21, 2025
b665a15
Merge branch 'main' into 2025/11/21/UNSAFELY_INCOMPATIBLE_WITH_S3_CON…
DaveCTurner Nov 21, 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
2 changes: 1 addition & 1 deletion ...ava/org/elasticsearch/repositories/s3/RepositoryS3ConditionalWritesUnsupportedRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void handle(HttpExchange exchange) throws IOException {
protected Settings extraRepositorySettings() {
return Settings.builder()
.put(super.extraRepositorySettings())
.put(S3Repository.UNSAFELY_INCOMPATIBLE_WITH_S3_WRITES.getKey(), true)
.put(S3Repository.UNSAFELY_INCOMPATIBLE_WITH_S3_CONDITIONAL_WRITES.getKey(), true)
.build();
}

Expand Down
2 changes: 1 addition & 1 deletion modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ public void addPurposeQueryParameter(OperationPurpose purpose, AwsRequestOverrid
/**
* Some storage claims S3-compatibility despite failing to support the {@code If-Match} and {@code If-None-Match} functionality
* properly. We allow to disable the use of this functionality, making all writes unconditional, using the
* {@link S3Repository#UNSAFELY_INCOMPATIBLE_WITH_S3_WRITES} setting.
* {@link S3Repository#UNSAFELY_INCOMPATIBLE_WITH_S3_CONDITIONAL_WRITES} setting.
*/
public boolean supportsConditionalWrites(OperationPurpose purpose) {
// REPOSITORY_ANALYSIS is a strict check for 100% S3 compatibility, including conditional write support
Expand Down
8 changes: 4 additions & 4 deletions modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ class S3Repository extends MeteredBlobStoreRepository {
Setting.Property.Dynamic
);

static final Setting<Boolean> UNSAFELY_INCOMPATIBLE_WITH_S3_WRITES = Setting.boolSetting(
static final Setting<Boolean> UNSAFELY_INCOMPATIBLE_WITH_S3_CONDITIONAL_WRITES = Setting.boolSetting(
"unsafely_incompatible_with_s3_conditional_writes",
false
);
Expand Down Expand Up @@ -279,7 +279,7 @@ class S3Repository extends MeteredBlobStoreRepository {
/**
* Some storage claims S3-compatibility despite failing to support the {@code If-Match} and {@code If-None-Match} functionality
* properly. We allow to disable the use of this functionality, making all writes unconditional, using the
* {@link #UNSAFELY_INCOMPATIBLE_WITH_S3_WRITES} setting.
* {@link #UNSAFELY_INCOMPATIBLE_WITH_S3_CONDITIONAL_WRITES} setting.
*/
private final boolean supportsConditionalWrites;

Expand Down Expand Up @@ -359,7 +359,7 @@ class S3Repository extends MeteredBlobStoreRepository {
}

coolDown = COOLDOWN_PERIOD.get(metadata.settings());
supportsConditionalWrites = UNSAFELY_INCOMPATIBLE_WITH_S3_WRITES.get(metadata.settings()) == Boolean.FALSE;
supportsConditionalWrites = UNSAFELY_INCOMPATIBLE_WITH_S3_CONDITIONAL_WRITES.get(metadata.settings()) == Boolean.FALSE;

if (supportsConditionalWrites == false) {
logger.warn(
Expand All @@ -368,7 +368,7 @@ class S3Repository extends MeteredBlobStoreRepository {
this warning, upgrade your storage to a system that is fully compatible with AWS S3 and then remove the [{}] \
repository setting; for more information, see [{}]""",
metadata.name(),
UNSAFELY_INCOMPATIBLE_WITH_S3_WRITES.getKey(),
UNSAFELY_INCOMPATIBLE_WITH_S3_CONDITIONAL_WRITES.getKey(),
ReferenceDocs.S3_COMPATIBLE_REPOSITORIES
);
}
Expand Down
2 changes: 1 addition & 1 deletion ...itory-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobContainerRetriesTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ protected BlobContainer createBlobContainer(
S3Repository.MAX_COPY_SIZE_BEFORE_MULTIPART.getDefault(Settings.EMPTY),
S3Repository.CANNED_ACL_SETTING.getDefault(Settings.EMPTY),
S3Repository.STORAGE_CLASS_SETTING.getDefault(Settings.EMPTY),
S3Repository.UNSAFELY_INCOMPATIBLE_WITH_S3_WRITES.getDefault(Settings.EMPTY),
S3Repository.UNSAFELY_INCOMPATIBLE_WITH_S3_CONDITIONAL_WRITES.getDefault(Settings.EMPTY),
repositoryMetadata,
BigArrays.NON_RECYCLING_INSTANCE,
new DeterministicTaskQueue().getThreadPool(),
Expand Down