From 61cc5a1e5440c126098546baee4a29af1a3df9ab Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sat, 27 Jul 2024 23:17:38 +0200
Subject: [PATCH 1/2] Add retries to test `02911_backup_restore_keeper_map`

---
 programs/server/config.d/backups.xml          | 13 ++++++++++++
 .../server/config.d/enable_keeper_map.xml     |  1 +
 .../02911_backup_restore_keeper_map.sh        | 20 +++++++++++++++----
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 programs/server/config.d/backups.xml
 create mode 120000 programs/server/config.d/enable_keeper_map.xml

diff --git a/programs/server/config.d/backups.xml b/programs/server/config.d/backups.xml
new file mode 100644
index 00000000000..382794e1123
--- /dev/null
+++ b/programs/server/config.d/backups.xml
@@ -0,0 +1,13 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <backups>
+                <type>local</type>
+                <path>/tmp/backups/</path>
+            </backups>
+        </disks>
+    </storage_configuration>
+    <backups>
+        <allowed_disk>backups</allowed_disk>
+    </backups>
+</clickhouse>
diff --git a/programs/server/config.d/enable_keeper_map.xml b/programs/server/config.d/enable_keeper_map.xml
new file mode 120000
index 00000000000..47c36159882
--- /dev/null
+++ b/programs/server/config.d/enable_keeper_map.xml
@@ -0,0 +1 @@
+../../../tests/config/config.d/enable_keeper_map.xml
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh b/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh
index ccdf52a6e23..385583acbbe 100755
--- a/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh
+++ b/tests/queries/0_stateless/02911_backup_restore_keeper_map.sh
@@ -11,11 +11,23 @@ $CLICKHOUSE_CLIENT -nm -q "
     CREATE TABLE $database_name.02911_backup_restore_keeper_map1 (key UInt64, value String) Engine=KeeperMap('/' || currentDatabase() || '/test02911') PRIMARY KEY key;
     CREATE TABLE $database_name.02911_backup_restore_keeper_map2 (key UInt64, value String) Engine=KeeperMap('/' || currentDatabase() || '/test02911') PRIMARY KEY key; -- table using same Keeper path as 02911_backup_restore_keeper_map1
     CREATE TABLE $database_name.02911_backup_restore_keeper_map3 (key UInt64, value String) Engine=KeeperMap('/' || currentDatabase() || '/test02911_different') PRIMARY KEY key;
-
-    INSERT INTO $database_name.02911_backup_restore_keeper_map2 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 5000;
-    INSERT INTO $database_name.02911_backup_restore_keeper_map3 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 3000;
 "
 
+# KeeperMap table engine doesn't have internal retries for interaction with Keeper. Do it on our own, otherwise tests with overloaded server can be flaky.
+while true
+do
+    $CLICKHOUSE_CLIENT -nm -q "INSERT INTO $database_name.02911_backup_restore_keeper_map2 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 5000;
+    " | grep -q "KEEPER_EXCEPTION" && sleep 1 && continue
+    break
+done
+
+while true
+do
+    $CLICKHOUSE_CLIENT -nm -q "INSERT INTO $database_name.02911_backup_restore_keeper_map3 SELECT number, 'test' || toString(number) FROM system.numbers LIMIT 3000;
+    " | grep -q "KEEPER_EXCEPTION" && sleep 1 && continue
+    break
+done
+
 backup_path="$database_name"
 for i in $(seq 1 3); do
     $CLICKHOUSE_CLIENT -q "SELECT count() FROM $database_name.02911_backup_restore_keeper_map$i;"
@@ -45,4 +57,4 @@ for i in $(seq 1 3); do
     $CLICKHOUSE_CLIENT -q "SELECT count() FROM $database_name.02911_backup_restore_keeper_map$i;"
 done
 
-$CLICKHOUSE_CLIENT -q "DROP DATABASE $database_name SYNC;"
\ No newline at end of file
+$CLICKHOUSE_CLIENT -q "DROP DATABASE $database_name SYNC;"

From 29b804adf38401dd47298ed285aee587b732595b Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sun, 28 Jul 2024 14:01:17 +0200
Subject: [PATCH 2/2] Wrap log lines in the CI report for functional tests

---
 tests/ci/report.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/ci/report.py b/tests/ci/report.py
index 77043dfc8be..48e24f9c870 100644
--- a/tests/ci/report.py
+++ b/tests/ci/report.py
@@ -135,6 +135,7 @@ th {{ cursor: pointer; }}
 tr:hover {{ filter: var(--tr-hover-filter); }}
 .expandable {{ cursor: pointer; }}
 .expandable-content {{ display: none; }}
+pre {{ white-space: pre-wrap; }}
 #fish {{ display: none; float: right; position: relative; top: -20em; right: 2vw; margin-bottom: -20em; width: 30vw; filter: brightness(7%); z-index: -1; }}
 
 .themes {{