From 28b3aa23422d74a9a04e0838fd8b60cb5fdb4d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wa=C5=9B?= Date: Thu, 19 Sep 2024 12:08:09 +0200 Subject: [PATCH 1/2] Switch to a stable SQL Server Docker image for tests The CU13 version started misbehaving, so we switched to latest, but it's also causing issues. CU14 was reported by other users to work. --- .../test/java/io/trino/plugin/sqlserver/TestingSqlServer.java | 2 +- .../product/launcher/env/environment/EnvMultinodeSqlserver.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java index ed720a6c8e15..a2c06787eb87 100644 --- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java +++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestingSqlServer.java @@ -64,7 +64,7 @@ public final class TestingSqlServer .build(); private static final DockerImageName IMAGE_NAME = DockerImageName.parse("mcr.microsoft.com/mssql/server"); - public static final String DEFAULT_VERSION = "2017-latest"; + public static final String DEFAULT_VERSION = "2017-CU14"; public static final String LATEST_VERSION = "2019-CU13-ubuntu-20.04"; private final MSSQLServerContainer container; diff --git a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSqlserver.java b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSqlserver.java index b1b9e0e8d86c..1eb630f4ee9e 100644 --- a/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSqlserver.java +++ b/testing/trino-product-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvMultinodeSqlserver.java @@ -56,7 +56,7 @@ public void extendEnvironment(Environment.Builder builder) @SuppressWarnings("resource") private DockerContainer createSqlServer() { - DockerContainer container = new DockerContainer("mcr.microsoft.com/mssql/server:2017-latest", "sqlserver") + DockerContainer container = new DockerContainer("mcr.microsoft.com/mssql/server:2017-CU14", "sqlserver") .withEnv("ACCEPT_EULA", "Y") .withEnv("SA_PASSWORD", "SQLServerPass1") .withStartupCheckStrategy(new IsRunningStartupCheckStrategy()) From dbd3b98952fdc980c2f8a06ebbf531fe24a408a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wa=C5=9B?= Date: Thu, 19 Sep 2024 12:09:48 +0200 Subject: [PATCH 2/2] drop! stress test SQL Server --- .github/workflows/ci.yml | 132 ++++++++++----------------------------- 1 file changed, 33 insertions(+), 99 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00b643044056..6ebae3a1ae75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -424,72 +424,26 @@ jobs: touch gib-impacted.log cat < .github/test-matrix.yaml include: - - modules: - - client/trino-jdbc - - plugin/trino-base-jdbc - - plugin/trino-memory - - plugin/trino-thrift - - modules: - - lib/trino-orc - - lib/trino-parquet - - modules: - - lib/trino-filesystem - - lib/trino-filesystem-azure - - lib/trino-filesystem-manager - - lib/trino-filesystem-s3 - - lib/trino-hdfs - - { modules: core/trino-main } - - { modules: lib/trino-filesystem-azure, profile: cloud-tests } - - { modules: lib/trino-filesystem-gcs, profile: cloud-tests } - - { modules: lib/trino-filesystem-s3, profile: cloud-tests } - - { modules: lib/trino-hdfs, profile: cloud-tests } - - { modules: plugin/trino-accumulo } - - { modules: plugin/trino-bigquery } - - { modules: plugin/trino-bigquery, profile: cloud-tests-2 } - - { modules: plugin/trino-cassandra } - - { modules: plugin/trino-clickhouse } - - { modules: plugin/trino-delta-lake } - - { modules: plugin/trino-delta-lake, profile: cloud-tests } - - { modules: plugin/trino-delta-lake, profile: fte-tests } - - { modules: plugin/trino-druid } - - { modules: plugin/trino-elasticsearch } - - { modules: plugin/trino-exasol } - - { modules: plugin/trino-google-sheets } - - { modules: plugin/trino-hive } - - { modules: plugin/trino-hive, profile: fte-tests } - - { modules: plugin/trino-hive, profile: test-parquet } - - { modules: plugin/trino-hudi } - - { modules: plugin/trino-iceberg } - - { modules: plugin/trino-iceberg, profile: cloud-tests } - - { modules: plugin/trino-iceberg, profile: fte-tests } - - { modules: plugin/trino-iceberg, profile: minio-and-avro } - - { modules: plugin/trino-ignite } - - { modules: plugin/trino-kafka } - - { modules: plugin/trino-kudu } - - { modules: plugin/trino-mariadb } - - { modules: plugin/trino-mongodb } - - { modules: plugin/trino-mysql } - - { modules: plugin/trino-openlineage } - - { modules: plugin/trino-opensearch } - - { modules: plugin/trino-oracle } - - { modules: plugin/trino-phoenix5 } - - { modules: plugin/trino-pinot } - - { modules: plugin/trino-postgresql } - - { modules: plugin/trino-raptor-legacy } - - { modules: plugin/trino-redis } - - { modules: plugin/trino-redshift } - - { modules: plugin/trino-redshift, profile: cloud-tests } - - { modules: plugin/trino-redshift, profile: fte-tests } - - { modules: plugin/trino-resource-group-managers } - - { modules: plugin/trino-singlestore } - - { modules: plugin/trino-snowflake } - - { modules: plugin/trino-snowflake, profile: cloud-tests } - { modules: plugin/trino-sqlserver } - - { modules: testing/trino-faulttolerant-tests, profile: default } - - { modules: testing/trino-faulttolerant-tests, profile: test-fault-tolerant-delta } - - { modules: testing/trino-faulttolerant-tests, profile: test-fault-tolerant-hive } - - { modules: testing/trino-faulttolerant-tests, profile: test-fault-tolerant-iceberg } - - { modules: testing/trino-tests } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } + - { modules: plugin/trino-sqlserver } EOF ./.github/bin/build-matrix-from-impacted.py -v -i gib-impacted.log -m .github/test-matrix.yaml -o matrix.json echo "Matrix: $(jq '.' matrix.json)" @@ -867,41 +821,21 @@ jobs: config: - default suite: - - suite-1 - - suite-2 - - suite-3 - # suite-4 does not exist - - suite-5 - - suite-6-non-generic - suite-7-non-generic - - suite-hive-transactional - - suite-azure - - suite-delta-lake-databricks91 - - suite-delta-lake-databricks104 - - suite-delta-lake-databricks113 - - suite-delta-lake-databricks122 - - suite-delta-lake-databricks133 - - suite-databricks-unity-http-hms - - suite-gcs - - suite-clients - - suite-functions - - suite-tpch - - suite-tpcds - - suite-storage-formats-detailed - - suite-parquet - - suite-oauth2 - - suite-ldap - - suite-compatibility - - suite-all-connectors-smoke - - suite-delta-lake-oss - - suite-kafka - - suite-cassandra - - suite-clickhouse - - suite-mysql - - suite-iceberg - - suite-snowflake - - suite-hudi - - suite-ignite + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic + - suite-7-non-generic exclude: - suite: suite-azure ignore exclusion if: >-