mirrors
/
elasticsearch
mirror of https://mirror.osredm.com/root/elasticsearch.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert MinIO tests to `RELEASE.2024-12-18T13-15-44Z` (#129337) 

This reverses the upgrade in #128424, except it puts the workaround in
the correct test suite and leaves several comments in place.

Relates https://github.com/minio/minio/issues/21377 Closes #129127
Closes #129157
This commit is contained in:
David Turner 2025-06-12 16:02:31 +01:00 committed by GitHub
parent 4cda8c2dcd
commit 668fe29a00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/fixtures/minio-fixture/src/main/java/org/elasticsearch/test/fixtures/minio/MinioTestContainer.java vendored
View File

@ -16,7 +16,8 @@ import org.testcontainers.images.builder.ImageFromDockerfile;
public final class MinioTestContainer extends DockerEnvironmentAwareTestContainer {
// NB releases earlier than 2025-05-24 are buggy, see https://github.com/minio/minio/issues/21189, and #127166 for a workaround
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2025-05-24T17-08-30Z";
// However the 2025-05-24 release is also buggy, see https://github.com/minio/minio/issues/21377, and this has no workaround
public static final String DOCKER_BASE_IMAGE = "minio/minio:RELEASE.2024-12-18T13-15-44Z";
private static final int servicePort = 9000;
private final boolean enabled;

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

@ -33,6 +33,10 @@ public class MinioRepositoryAnalysisRestIT extends AbstractRepositoryAnalysisRes
.keystore("s3.client.repository_test_kit.secret_key", "s3_test_secret_key")
.setting("s3.client.repository_test_kit.endpoint", minioFixture::getAddress)
.setting("xpack.security.enabled", "false")
// Skip listing of pre-existing uploads during a CAS because MinIO sometimes leaks them; also reduce the delay before proceeding
// TODO do not set these if running a MinIO version in which https://github.com/minio/minio/issues/21189 is fixed
.setting("repository_s3.compare_and_exchange.time_to_live", "-1")
.setting("repository_s3.compare_and_exchange.anti_contention_delay", "100ms")
.setting("xpack.ml.enabled", "false")
.build();