From 1000092cbae62eca5db219df097e911309dc0786 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 7 May 2025 12:44:16 -0400 Subject: [PATCH 01/11] update broken tests list with standard terms --- tests/broken_tests.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/broken_tests.json b/tests/broken_tests.json index d9d0008ef88f..7873ccca67ef 100644 --- a/tests/broken_tests.json +++ b/tests/broken_tests.json @@ -1,58 +1,58 @@ { "test_postgresql_replica_database_engine_2/test.py::test_quoting_publication": { "message": "DB::Exception: Syntax error:", - "reason": "syntax error" + "reason": "NEEDSFIX syntax error" }, "test_distributed_inter_server_secret/test.py::test_secure_cluster_distributed_over_distributed_different_users": { "message": "DB::NetException: Connection reset by peer, while reading from socket", - "reason": "network issue" + "reason": "NEEDSFIX network issue" }, "02920_alter_column_of_projections": { - "reason": "requires different settings" + "reason": "NEEDSFIX requires different settings" }, "02888_system_tables_with_inaccsessible_table_function": { - "reason": "todo investigate" + "reason": "INVESTIGATE" }, "03094_grouparraysorted_memory": { - "reason": "flaky" + "reason": "KNOWN flaky" }, "02700_s3_part_INT_MAX": { - "reason": "fails with asan" + "reason": "KNOWN fails with asan" }, "test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_avg":{ - "reason": "not run by upstream" + "reason": "KNOWN not run by upstream" }, "test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_uniq_exact[1000]":{ - "reason": "not run by upstream" + "reason": "KNOWN not run by upstream" }, "test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_uniq_exact[500000] ":{ - "reason": "not run by upstream" + "reason": "KNOWN not run by upstream" }, "test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_uniq_exact_variadic[1000]":{ - "reason": "not run by upstream" + "reason": "KNOWN not run by upstream" }, "test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_uniq_exact_variadic[500000]":{ - "reason": "not run by upstream" + "reason": "KNOWN not run by upstream" }, "test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[cache-True]": { - "reason": "errors upstream" + "reason": "KNOWN errors upstream" }, "test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[direct-True]":{ - "reason": "errors upstream" + "reason": "KNOWN errors upstream" }, "test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[flat-True]":{ - "reason": "errors upstream" + "reason": "KNOWN errors upstream" }, "test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[hashed-True]":{ - "reason": "errors upstream" + "reason": "KNOWN errors upstream" }, "test_dictionaries_all_layouts_separate_sources/test_mongo_uri.py::test_simple_ssl[flat-True]":{ - "reason": "errors upstream" + "reason": "KNOWN errors upstream" }, "test_storage_mongodb/test.py::test_secure_connection[True]":{ - "reason": "fails upstream" + "reason": "KNOWN fails upstream" }, "test_table_function_mongodb/test.py::test_secure_connection[True]":{ - "reason": "fails upstream" + "reason": "KNOWN fails upstream" } } From f9dcf231c6ce5162344c7b41832406d2f3235f6f Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 7 May 2025 12:46:50 -0400 Subject: [PATCH 02/11] report fixes --- .github/create_workflow_report.py | 4 ++-- tests/ci/integration_tests_runner.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/create_workflow_report.py b/.github/create_workflow_report.py index 618ee98988fd..a7f30f72aedf 100755 --- a/.github/create_workflow_report.py +++ b/.github/create_workflow_report.py @@ -434,7 +434,7 @@ def get_cves(pr_number, commit_sha): def url_to_html_link(url: str) -> str: if not url: return "" - text = url.split("/")[-1] + text = url.split("/")[-1].replace("__", "_") if not text: text = "results" return f'{text}' @@ -442,7 +442,7 @@ def url_to_html_link(url: str) -> str: def format_test_name_for_linewrap(text: str) -> str: """Tweak the test name to improve line wrapping.""" - return text.replace(".py::", "/") + return f'{text}' def format_test_status(text: str) -> str: diff --git a/tests/ci/integration_tests_runner.py b/tests/ci/integration_tests_runner.py index 18725a509095..b41293422227 100755 --- a/tests/ci/integration_tests_runner.py +++ b/tests/ci/integration_tests_runner.py @@ -938,7 +938,7 @@ def run_impl(self, repo_path, build_path): ) for fail_status in ("ERROR", "FAILED"): - for failed_test in group_counters[fail_status]: + for failed_test in group_counters[fail_status].copy(): if failed_test in known_broken_tests.keys(): fail_message = known_broken_tests[failed_test].get("message") if not fail_message: From 1cb5f7cc171cb58bb293e76833c2c2e201b40cb3 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 7 May 2025 13:53:21 -0400 Subject: [PATCH 03/11] cross out failing tests --- tests/broken_tests.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/broken_tests.json b/tests/broken_tests.json index 7873ccca67ef..22c9126daad3 100644 --- a/tests/broken_tests.json +++ b/tests/broken_tests.json @@ -19,6 +19,9 @@ "02700_s3_part_INT_MAX": { "reason": "KNOWN fails with asan" }, + "02783_parsedatetimebesteffort_syslog": { + "reason": "INVESTIGATE" + }, "test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_avg":{ "reason": "KNOWN not run by upstream" }, @@ -54,5 +57,20 @@ }, "test_table_function_mongodb/test.py::test_secure_connection[True]":{ "reason": "KNOWN fails upstream" + }, + "test_reload_certificate/test.py::test_chain_reload": { + "reason": "INVESTIGATE" + }, + "test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[flat-True]": { + "reason": "INVESTIGATE" + }, + "test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[hashed-True]": { + "reason": "INVESTIGATE" + }, + "test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[cache-True]": { + "reason": "INVESTIGATE" + }, + "test_quorum_inserts/test.py::test_insert_quorum_with_keeper_loss_connection": { + "reason": "INVESTIGATE" } } From 5d283165728fabf6b8cdcba97a6493374a39bf92 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 7 May 2025 16:07:45 -0400 Subject: [PATCH 04/11] update crossout msgs --- tests/broken_tests.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/broken_tests.json b/tests/broken_tests.json index 22c9126daad3..e275532c10a1 100644 --- a/tests/broken_tests.json +++ b/tests/broken_tests.json @@ -20,7 +20,7 @@ "reason": "KNOWN fails with asan" }, "02783_parsedatetimebesteffort_syslog": { - "reason": "INVESTIGATE" + "reason": "NEEDSFIX - fixed upstream, needs backport" }, "test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_avg":{ "reason": "KNOWN not run by upstream" @@ -59,7 +59,7 @@ "reason": "KNOWN fails upstream" }, "test_reload_certificate/test.py::test_chain_reload": { - "reason": "INVESTIGATE" + "reason": "NEEDSFIX - fixed upstream, needs backport" }, "test_dictionaries_all_layouts_separate_sources/test_mongo.py::test_simple_ssl[flat-True]": { "reason": "INVESTIGATE" From d4bc78033f877c1a2892c2a2b686eb90fc121c34 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Thu, 8 May 2025 15:00:35 -0400 Subject: [PATCH 05/11] more fails 02481_async_insert_dedup 02286_quantile_tdigest_infinity --- tests/broken_tests.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/broken_tests.json b/tests/broken_tests.json index e275532c10a1..3f0d249a028e 100644 --- a/tests/broken_tests.json +++ b/tests/broken_tests.json @@ -13,6 +13,12 @@ "02888_system_tables_with_inaccsessible_table_function": { "reason": "INVESTIGATE" }, + "02481_async_insert_dedup": { + "reason": "INVESTIGATE - fails in debug" + }, + "02286_quantile_tdigest_infinity": { + "reason": "INVESTIGATE - fails in tsan" + }, "03094_grouparraysorted_memory": { "reason": "KNOWN flaky" }, From c37266dbff4b6363f4fc4100488430454c134073 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Thu, 8 May 2025 18:11:12 -0400 Subject: [PATCH 06/11] add broken test 03145_non_loaded_projection_backup --- tests/broken_tests.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/broken_tests.json b/tests/broken_tests.json index 3f0d249a028e..1d45349750fc 100644 --- a/tests/broken_tests.json +++ b/tests/broken_tests.json @@ -28,6 +28,9 @@ "02783_parsedatetimebesteffort_syslog": { "reason": "NEEDSFIX - fixed upstream, needs backport" }, + "03145_non_loaded_projection_backup": { + "reason": "INVESTIGATE - fails in tsan" + }, "test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_avg":{ "reason": "KNOWN not run by upstream" }, From 193bef67b2b063bb67cdde12cde471036050e26b Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Thu, 8 May 2025 14:41:38 -0400 Subject: [PATCH 07/11] Try to avoid stress test errors that may be related to running out of resources --- docker/test/stress/run.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh index cb6b44fec543..41b53534b704 100644 --- a/docker/test/stress/run.sh +++ b/docker/test/stress/run.sh @@ -57,6 +57,10 @@ azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log & config_logs_export_cluster /etc/clickhouse-server/config.d/system_logs_export.yaml +# NOTE(strtgbb): Trying to avoid errors that may be related to running out of resources +export CLICKHOUSE_MAX_THREADS=8 +export CLICKHOUSE_MAX_CONCURRENT_QUERIES=4 + start_server setup_logs_replication From 901eea5264fd22c0ca822f4fae4e5070fc5cb03b Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 21 May 2025 17:29:30 -0400 Subject: [PATCH 08/11] add some unstable tests to broken_tests.json --- tests/broken_tests.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/broken_tests.json b/tests/broken_tests.json index 1d45349750fc..122e9e4059d1 100644 --- a/tests/broken_tests.json +++ b/tests/broken_tests.json @@ -31,6 +31,15 @@ "03145_non_loaded_projection_backup": { "reason": "INVESTIGATE - fails in tsan" }, + "00078_group_by_arrays": { + "reason": "INVESTIGATE - fail in debug" + }, + "02539_settings_aliases": { + "reason": "INVESTIGATE - fail in msan" + }, + "01052_window_view_proc_tumble_to_now": { + "reason": "INVESTIGATE - fail in msan" + }, "test_backward_compatibility/test_aggregate_function_state.py::test_backward_compatability_for_avg":{ "reason": "KNOWN not run by upstream" }, From e0ab89e86e404c5ac3a5f457d1ea3ea230a1bef4 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 21 May 2025 18:07:03 -0400 Subject: [PATCH 09/11] pin stress test dockerfile to newer base image, resolve gpg issue --- docker/test/stress/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/test/stress/Dockerfile b/docker/test/stress/Dockerfile index 507bf90bc2dd..359a05b20713 100644 --- a/docker/test/stress/Dockerfile +++ b/docker/test/stress/Dockerfile @@ -1,7 +1,7 @@ # rebuild in #33610 # docker build -t altinityinfra/stress-test . ARG FROM_TAG=latest -FROM altinityinfra/stateful-test:$FROM_TAG +FROM altinityinfra/stateful-test:ce3c0a6ed901 RUN apt-get update -y \ && env DEBIAN_FRONTEND=noninteractive \ From d002e5f63825e7b7ef48dda45b19295cc197357a Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 21 May 2025 19:36:46 -0400 Subject: [PATCH 10/11] skippable regression --- .github/workflows/release_branches.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml index 6fb776b11c8f..fce8b7f13c78 100644 --- a/.github/workflows/release_branches.yml +++ b/.github/workflows/release_branches.yml @@ -486,8 +486,8 @@ jobs: ##################################### REGRESSION TESTS ###################################### ############################################################################################# RegressionTestsRelease: - needs: [BuilderDebRelease] - if: ${{ !failure() && !cancelled() }} + needs: [RunConfig, BuilderDebRelease] + if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.RunConfig.outputs.data).ci_settings.exclude_keywords, 'regression')}} uses: ./.github/workflows/regression.yml secrets: inherit with: @@ -497,8 +497,8 @@ jobs: build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} timeout_minutes: 300 RegressionTestsAarch64: - needs: [BuilderDebAarch64] - if: ${{ !failure() && !cancelled() }} + needs: [RunConfig, BuilderDebAarch64] + if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.RunConfig.outputs.data).ci_settings.exclude_keywords, 'regression') && !contains(fromJson(needs.RunConfig.outputs.data).ci_settings.exclude_keywords, 'aarch64')}} uses: ./.github/workflows/regression.yml secrets: inherit with: From ede6d9c59e93e5eeb2452480d15c57f47852a8f3 Mon Sep 17 00:00:00 2001 From: strtgbb <146047128+strtgbb@users.noreply.github.com> Date: Wed, 21 May 2025 18:11:46 -0400 Subject: [PATCH 11/11] update grype version --- .github/grype/run_grype_scan.sh | 2 +- .github/workflows/grype_scan.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/grype/run_grype_scan.sh b/.github/grype/run_grype_scan.sh index c5ce0b1b10d3..af428e37d669 100755 --- a/.github/grype/run_grype_scan.sh +++ b/.github/grype/run_grype_scan.sh @@ -3,7 +3,7 @@ set -e IMAGE=$1 -GRYPE_VERSION="v0.80.1" +GRYPE_VERSION=${GRYPE_VERSION:-"v0.92.2"} docker pull $IMAGE docker pull anchore/grype:${GRYPE_VERSION} diff --git a/.github/workflows/grype_scan.yml b/.github/workflows/grype_scan.yml index 1414129fd666..68c128e4e470 100644 --- a/.github/workflows/grype_scan.yml +++ b/.github/workflows/grype_scan.yml @@ -20,6 +20,7 @@ env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + GRYPE_VERSION: "v0.92.2-arm64v8" jobs: grype_scan: