Skip to content

Commit 233847a

Browse files
authored
Revert MinIO tests to RELEASE.2024-12-18T13-15-44Z (#129337) (#129351)
This reverses the upgrade in #128424, except it puts the workaround in the correct test suite and leaves several comments in place. Relates minio/minio#21377 Closes #129127 Closes #129157
1 parent cecbe31 commit 233847a

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
public final class MinioTestContainer extends DockerEnvironmentAwareTestContainer {
1717

1818
// NB releases earlier than 2025-05-24 are buggy, see https://github.com/minio/minio/issues/21189, and #127166 for a workaround
19-
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2025-05-24T17-08-30Z";
19+
// However the 2025-05-24 release is also buggy, see https://github.com/minio/minio/issues/21377, and this has no workaround
20+
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2024-12-18T13-15-44Z";
2021

2122
private static final int servicePort = 9000;
2223
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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ public class MinioRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRes
3333
.keystore("s3.client.repository_test_kit.secret_key", "s3_test_secret_key")
3434
.setting("s3.client.repository_test_kit.endpoint", minioFixture::getAddress)
3535
.setting("xpack.security.enabled", "false")
36+
// Skip listing of pre-existing uploads during a CAS because MinIO sometimes leaks them; also reduce the delay before proceeding
37+
// TODO do not set these if running a MinIO version in which https://github.com/minio/minio/issues/21189 is fixed
38+
.setting("repository_s3.compare_and_exchange.time_to_live", "-1")
39+
.setting("repository_s3.compare_and_exchange.anti_contention_delay", "100ms")
3640
.setting("xpack.ml.enabled", "false")
3741
.build();
3842

0 commit comments

Comments
 (0)