Skip to content

Commit 3a285cf

Browse files
authored
Upgrade MinIO (& work around bug) (#132178)
Relates minio/minio#21456 Closes #131742 Backport of #131815 to 8.18
1 parent aceba66 commit 3a285cf

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@
1515

1616
public final class MinioTestContainer extends DockerEnvironmentAwareTestContainer {
1717

18+
// NB releases earlier than 2025-05-24 are buggy, see https://github.com/minio/minio/issues/21189, and #127166 for a workaround.
19+
// However the 2025-05-24 release is also buggy, see https://github.com/minio/minio/issues/21377, and this has no workaround.
20+
// Also https://github.com/minio/minio/issues/21456 seems to affect releases newer than 2025-05-24, see #131815 for workaround.
21+
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2025-07-23T15-54-02Z";
22+
1823
private static final int servicePort = 9000;
19-
// NB releases earlier than 2025-05-24 are buggy, see https://github.com/minio/minio/issues/21189, and #127166 for a workaround
20-
// However the 2025-05-24 release is also buggy, see https://github.com/minio/minio/issues/21377, and this has no workaround
21-
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2025-06-13T11-33-47Z";
2224
private final boolean enabled;
2325

2426
public MinioTestContainer(boolean enabled, String accessKey, String secretKey, String bucketName) {

x-pack/plugin/snapshot-repo-test-kit/qa/minio/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/MinioRepositoryAnalysisRestIT.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ public class MinioRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRes
3434
.setting("s3.client.repository_test_kit.protocol", () -> "http")
3535
.setting("s3.client.repository_test_kit.endpoint", minioFixture::getAddress)
3636
.setting("xpack.security.enabled", "false")
37+
// Skip listing of pre-existing uploads during a CAS because MinIO sometimes leaks them; also reduce the delay before proceeding
38+
// TODO do not set these if running a MinIO version in which https://github.com/minio/minio/issues/21189
39+
// and https://github.com/minio/minio/issues/21456 are both fixed
40+
.setting("repository_s3.compare_and_exchange.time_to_live", "-1")
41+
.setting("repository_s3.compare_and_exchange.anti_contention_delay", "100ms")
3742
.setting("xpack.ml.enabled", "false")
3843
.build();
3944

0 commit comments

Comments
 (0)