From 686eba761c477a8ce3f8d703317b8bcfd3d5a755 Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 19 Nov 2021 21:17:47 +0300
Subject: [PATCH 1/2] github actions: compress .log. too

---
 tests/ci/s3_helper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/ci/s3_helper.py b/tests/ci/s3_helper.py
index 82791234f1a..713e3653bf2 100644
--- a/tests/ci/s3_helper.py
+++ b/tests/ci/s3_helper.py
@@ -49,7 +49,7 @@ class S3Helper():
             else:
                 logging.info("No content type provied for %s", file_path)
         else:
-            if s3_path.endswith("txt") or s3_path.endswith("log") or s3_path.endswith("err") or s3_path.endswith("out"):
+            if s3_path.endswith("txt") or s3_path.endswith("log") or ".log." in s3_path or s3_path.endswith("err") or s3_path.endswith("out"):
                 logging.info("Going to compress file log file %s to %s", file_path, file_path + ".gz")
                 compress_file_fast(file_path, file_path + ".gz")
                 file_path += ".gz"

From d0ecdb617ed789d53d99dcf842edf5fba8a1a6be Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Fri, 19 Nov 2021 21:17:47 +0300
Subject: [PATCH 2/2] Remove duplicated not compressed logs from CI (actions)

Right now we cannot remove that compression since non-github actions
check will upload non compressed files then, but once old CI will be
removed it seems to be possible to remove that manual compression.
---
 docker/test/stateful/run.sh  | 7 +++++++
 docker/test/stateless/run.sh | 5 +++++
 docker/test/stress/run.sh    | 2 ++
 3 files changed, 14 insertions(+)

diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index a8cae760d55..680392df43e 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -120,8 +120,12 @@ timeout "$MAX_RUN_TIME" bash -c run_tests ||:
 ./process_functional_tests_result.py || echo -e "failure\tCannot parse results" > /test_output/check_status.tsv
 
 grep -Fa "Fatal" /var/log/clickhouse-server/clickhouse-server.log ||:
+
 pigz < /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log.gz ||:
+# FIXME: remove once only github actions will be left
+rm /var/log/clickhouse-server/clickhouse-server.log
 mv /var/log/clickhouse-server/stderr.log /test_output/ ||:
+
 if [[ -n "$WITH_COVERAGE" ]] && [[ "$WITH_COVERAGE" -eq 1 ]]; then
     tar -chf /test_output/clickhouse_coverage.tar.gz /profraw ||:
 fi
@@ -130,6 +134,9 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     grep -Fa "Fatal" /var/log/clickhouse-server/clickhouse-server2.log ||:
     pigz < /var/log/clickhouse-server/clickhouse-server1.log > /test_output/clickhouse-server1.log.gz ||:
     pigz < /var/log/clickhouse-server/clickhouse-server2.log > /test_output/clickhouse-server2.log.gz ||:
+    # FIXME: remove once only github actions will be left
+    rm /var/log/clickhouse-server/clickhouse-server1.log
+    rm /var/log/clickhouse-server/clickhouse-server2.log
     mv /var/log/clickhouse-server/stderr1.log /test_output/ ||:
     mv /var/log/clickhouse-server/stderr2.log /test_output/ ||:
 fi
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index ad0a805488f..93f64fdec66 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -135,6 +135,8 @@ done
 
 wait ||:
 
+# Compressed (FIXME: remove once only github actions will be left)
+rm /var/log/clickhouse-server/clickhouse-server.log
 mv /var/log/clickhouse-server/stderr.log /test_output/ ||:
 if [[ -n "$WITH_COVERAGE" ]] && [[ "$WITH_COVERAGE" -eq 1 ]]; then
     tar -chf /test_output/clickhouse_coverage.tar.gz /profraw ||:
@@ -155,6 +157,9 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     grep -Fa "Fatal" /var/log/clickhouse-server/clickhouse-server2.log ||:
     pigz < /var/log/clickhouse-server/clickhouse-server1.log > /test_output/clickhouse-server1.log.gz ||:
     pigz < /var/log/clickhouse-server/clickhouse-server2.log > /test_output/clickhouse-server2.log.gz ||:
+    # FIXME: remove once only github actions will be left
+    rm /var/log/clickhouse-server/clickhouse-server1.log
+    rm /var/log/clickhouse-server/clickhouse-server2.log
     mv /var/log/clickhouse-server/stderr1.log /test_output/ ||:
     mv /var/log/clickhouse-server/stderr2.log /test_output/ ||:
     tar -chf /test_output/zookeeper_log_dump1.tar /var/lib/clickhouse1/data/system/zookeeper_log ||:
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index ed215bd4273..a2810c7ce75 100755
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -185,6 +185,8 @@ zgrep -Fa "########################################" /test_output/* > /dev/null
 for log_file in /var/log/clickhouse-server/clickhouse-server.log*
 do
     pigz < "${log_file}" > /test_output/"$(basename ${log_file})".gz
+    # FIXME: remove once only github actions will be left
+    rm "${log_file}"
 done
 
 tar -chf /test_output/coordination.tar /var/lib/clickhouse/coordination ||: