From 0821d72f1cef93e437f5b38477f2a2d9d9611f8e Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Tue, 9 Jul 2024 17:06:37 +0200
Subject: [PATCH] Collect core dumps in more tests

---
 docker/test/stateful/run.sh            |  5 +++++
 docker/test/stateless/run.sh           |  2 ++
 docker/test/stateless/stress_tests.lib | 11 -----------
 docker/test/stateless/utils.lib        | 11 +++++++++++
 docker/test/stress/run.sh              |  3 +++
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index 2215ac2b37c..80e5e81a4b1 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -16,6 +16,9 @@ dpkg -i package_folder/clickhouse-client_*.deb
 
 ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
 
+# shellcheck disable=SC1091
+source /utils.lib
+
 # install test configs
 /usr/share/clickhouse-test/config/install.sh
 
@@ -272,3 +275,5 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     mv /var/log/clickhouse-server/stderr1.log /test_output/ ||:
     mv /var/log/clickhouse-server/stderr2.log /test_output/ ||:
 fi
+
+collect_core_dumps
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index 43d3c698d8a..fe551f5d6d6 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -399,3 +399,5 @@ if [[ -n "$USE_SHARED_CATALOG" ]] && [[ "$USE_SHARED_CATALOG" -eq 1 ]]; then
     mv /var/log/clickhouse-server/stderr1.log /test_output/ ||:
     tar -chf /test_output/coordination1.tar /var/lib/clickhouse1/coordination ||:
 fi
+
+collect_core_dumps
diff --git a/docker/test/stateless/stress_tests.lib b/docker/test/stateless/stress_tests.lib
index c069ccbdd8d..682da1df837 100644
--- a/docker/test/stateless/stress_tests.lib
+++ b/docker/test/stateless/stress_tests.lib
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# core.COMM.PID-TID
-sysctl kernel.core_pattern='core.%e.%p-%P'
-
 OK="\tOK\t\\N\t"
 FAIL="\tFAIL\t\\N\t"
 
@@ -315,12 +312,4 @@ function collect_query_and_trace_logs()
     done
 }
 
-function collect_core_dumps()
-{
-  find . -type f -maxdepth 1 -name 'core.*' | while read -r core; do
-      zstd --threads=0 "$core"
-      mv "$core.zst" /test_output/
-  done
-}
-
 # vi: ft=bash
diff --git a/docker/test/stateless/utils.lib b/docker/test/stateless/utils.lib
index 833e1a05384..90efb5b1a8e 100644
--- a/docker/test/stateless/utils.lib
+++ b/docker/test/stateless/utils.lib
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# core.COMM.PID-TID
+sysctl kernel.core_pattern='core.%e.%p-%P'
+
 function run_with_retry()
 {
     if [[ $- =~ e ]]; then
@@ -48,4 +51,12 @@ function timeout_with_logging() {
     return $exit_code
 }
 
+function collect_core_dumps()
+{
+  find . -type f -maxdepth 1 -name 'core.*' | while read -r core; do
+      zstd --threads=0 "$core"
+      mv "$core.zst" /test_output/
+  done
+}
+
 # vi: ft=bash
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index 323944591b1..86467394513 100644
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -21,6 +21,9 @@ source /attach_gdb.lib
 # shellcheck source=../stateless/stress_tests.lib
 source /stress_tests.lib
 
+# shellcheck disable=SC1091
+source /utils.lib
+
 install_packages package_folder
 
 # Thread Fuzzer allows to check more permutations of possible thread scheduling