From 4260c160ad76764d64f7450e2b27d3a9aac248af Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 27 Oct 2025 15:14:38 -0400 Subject: [PATCH 1/3] Add S3Repository.LEGACY_MD5_CHECKSUM_CALCULATION to list of repository-s3 settings Signed-off-by: Craig Perkins --- .../org/opensearch/repositories/s3/S3RepositoryPlugin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java index 0f501eae27ad0..a81a3dfd88c50 100644 --- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java +++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java @@ -373,7 +373,8 @@ public List> getSettings() { S3Repository.UPLOAD_RETRY_ENABLED, S3Repository.S3_PRIORITY_PERMIT_ALLOCATION_PERCENT, S3Repository.PERMIT_BACKED_TRANSFER_ENABLED, - S3Repository.S3_ASYNC_HTTP_CLIENT_TYPE + S3Repository.S3_ASYNC_HTTP_CLIENT_TYPE, + S3Repository.LEGACY_MD5_CHECKSUM_CALCULATION ); } From fc4970e312adb92b951982cef33fce095eb9e60a Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 27 Oct 2025 15:17:12 -0400 Subject: [PATCH 2/3] Add to CHANGELOG Signed-off-by: Craig Perkins --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ed9c5ac17e96..33f719fc12e0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Fix potential concurrent modification exception when updating allocation filters ([#19701])(https://github.com/opensearch-project/OpenSearch/pull/19701)) - Fix file-based ingestion consumer to handle start point beyond max line number([#19757])(https://github.com/opensearch-project/OpenSearch/pull/19757)) - Fixed assertion unsafe use of ClusterService.state() in ResourceUsageCollectorService ([#19775])(https://github.com/opensearch-project/OpenSearch/pull/19775)) +- Add S3Repository.LEGACY_MD5_CHECKSUM_CALCULATION to list of repository-s3 settings ([#19788](https://github.com/opensearch-project/OpenSearch/pull/19788)) ### Dependencies - Update to Gradle 9.1 ([#19575](https://github.com/opensearch-project/OpenSearch/pull/19575)) From 0786cffb819d64cf1adfeb01271a15390649fab7 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Mon, 27 Oct 2025 16:06:28 -0400 Subject: [PATCH 3/3] Use the affix setting Signed-off-by: Craig Perkins --- .../org/opensearch/repositories/s3/S3RepositoryPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java index a81a3dfd88c50..4b5510ad70186 100644 --- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java +++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java @@ -367,14 +367,14 @@ public List> getSettings() { S3ClientSettings.ROLE_ARN_SETTING, S3ClientSettings.IDENTITY_TOKEN_FILE_SETTING, S3ClientSettings.ROLE_SESSION_NAME_SETTING, + S3ClientSettings.LEGACY_MD5_CHECKSUM_CALCULATION, S3Repository.PARALLEL_MULTIPART_UPLOAD_MINIMUM_PART_SIZE_SETTING, S3Repository.PARALLEL_MULTIPART_UPLOAD_ENABLED_SETTING, S3Repository.REDIRECT_LARGE_S3_UPLOAD, S3Repository.UPLOAD_RETRY_ENABLED, S3Repository.S3_PRIORITY_PERMIT_ALLOCATION_PERCENT, S3Repository.PERMIT_BACKED_TRANSFER_ENABLED, - S3Repository.S3_ASYNC_HTTP_CLIENT_TYPE, - S3Repository.LEGACY_MD5_CHECKSUM_CALCULATION + S3Repository.S3_ASYNC_HTTP_CLIENT_TYPE ); }