From 38775e12d256c3b17338d1919ae3382d7313c54b Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Thu, 25 Sep 2025 12:47:09 +0200 Subject: [PATCH 1/2] Fix suite-compatibility for Trino 477 --- .../environment/EnvSinglenodeCompatibility.java | 3 +++ .../config-post477.properties | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/singlenode-compatibility/config-post477.properties diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java index 6bca55c902b7..be9bdf2d335b 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java @@ -109,6 +109,9 @@ private String getConfigFileFor(String dockerImage) if (getVersionFromDockerImageName(dockerImage) < 369) { return "config-pre369.properties"; } + if (getVersionFromDockerImageName(dockerImage) >= 477) { + return "config-post477.properties"; + } return "config.properties"; } diff --git a/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/singlenode-compatibility/config-post477.properties b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/singlenode-compatibility/config-post477.properties new file mode 100644 index 000000000000..178c0fb96f20 --- /dev/null +++ b/testing/trino-product-tests-launcher/src/main/resources/docker/trino-product-tests/conf/environment/singlenode-compatibility/config-post477.properties @@ -0,0 +1,14 @@ +coordinator=true +node-scheduler.include-coordinator=true +http-server.http.port=8081 +query.max-memory=2GB +query.max-memory-per-node=1.25GB +discovery-server.enabled=true +discovery.type=airlift_discovery +discovery.uri=http://compatibility-test-coordinator:8081 + +catalog.management=dynamic + +# Reduce the amount of memory used by the finished queries and task info cache +query.min-expire-age=1m +task.info.max-age=1m From 76fc478b013db8e1fb93a709327c3991bc8a172a Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Thu, 25 Sep 2025 12:51:00 +0200 Subject: [PATCH 2/2] Clarify the actual option that needs to be passed --- .../launcher/env/environment/EnvSinglenodeCompatibility.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java index be9bdf2d335b..50ed4567aed2 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeCompatibility.java @@ -161,8 +161,8 @@ private static class Config public Config(Map extraOptions) { - this.compatibilityTestVersion = parseInt(requireNonNull(extraOptions.get(TEST_DOCKER_VERSION), () -> format("Required extra option %s is null", TEST_DOCKER_VERSION))); - this.compatibilityTestDockerImage = requireNonNull(extraOptions.get(TEST_DOCKER_IMAGE), () -> format("Required extra option %s is null", TEST_DOCKER_IMAGE)); + this.compatibilityTestVersion = parseInt(requireNonNull(extraOptions.get(TEST_DOCKER_VERSION), () -> format("Required extra option compatibility.%s is null", TEST_DOCKER_VERSION))); + this.compatibilityTestDockerImage = requireNonNull(extraOptions.get(TEST_DOCKER_IMAGE), () -> format("Required extra option compatibility.%s is null", TEST_DOCKER_IMAGE)); } public int getCompatibilityTestVersion()