Skip to content

Commit e60d312

Browse files
authored
Upgrade MinIO to RELEASE.2025-09-07T16-13-09Z (#134286) (#134353)
Reverts workaround for minio/minio#21456 introduced in #131815.
1 parent 1e90c4d commit e60d312

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@
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";
18+
/*
19+
* Known issues broken down by MinIO release date:
20+
* [< 2025-05-24 ] known issue https://github.com/minio/minio/issues/21189; workaround in #127166
21+
* [= 2025-05-24 ] known issue https://github.com/minio/minio/issues/21377; no workaround
22+
* [> 2025-05-24 && < 2025-09-07] known issue https://github.com/minio/minio/issues/21456; workaround in #131815
23+
* [>= 2025-09-07 ] no known issues (yet)
24+
*/
25+
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2025-09-07T16-13-09Z";
2226

2327
private static final int servicePort = 9000;
2428
private final boolean enabled;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ 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")
4237
.setting("xpack.ml.enabled", "false")
4338
.build();
4439

0 commit comments

Comments
 (0)