From 89272e0925c91ed659b51741c58ddc364e149792 Mon Sep 17 00:00:00 2001
From: kssenii <sumarokovakseniia@mail.ru>
Date: Thu, 19 Oct 2023 11:23:56 +0200
Subject: [PATCH] Fix upgrade check, randomize more settings

---
 docker/test/upgrade/run.sh                             | 2 ++
 tests/clickhouse-test                                  | 3 +++
 tests/config/config.d/s3_storage_policy_by_default.xml | 1 -
 tests/config/install.sh                                | 1 +
 tests/config/users.d/s3_cache_new.xml                  | 7 +++++++
 5 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 tests/config/users.d/s3_cache_new.xml

diff --git a/docker/test/upgrade/run.sh b/docker/test/upgrade/run.sh
index c69d90b9af0..3580f8e5021 100644
--- a/docker/test/upgrade/run.sh
+++ b/docker/test/upgrade/run.sh
@@ -78,6 +78,7 @@ remove_keeper_config "create_if_not_exists" "[01]"
 rm /etc/clickhouse-server/config.d/merge_tree.xml
 rm /etc/clickhouse-server/config.d/enable_wait_for_shutdown_replicated_tables.xml
 rm /etc/clickhouse-server/users.d/nonconst_timezone.xml
+rm /etc/clickhouse-server/users.d/s3_cache_new.xml
 
 start
 stop
@@ -114,6 +115,7 @@ sudo chgrp clickhouse /etc/clickhouse-server/config.d/s3_storage_policy_by_defau
 rm /etc/clickhouse-server/config.d/merge_tree.xml
 rm /etc/clickhouse-server/config.d/enable_wait_for_shutdown_replicated_tables.xml
 rm /etc/clickhouse-server/users.d/nonconst_timezone.xml
+rm /etc/clickhouse-server/users.d/s3_cache_new.xml
 
 start
 
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index cab7d7e79ff..c0c2d482703 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -577,6 +577,9 @@ class SettingsRandomizer:
         ),
         "remote_filesystem_read_method": lambda: random.choice(["read", "threadpool"]),
         "local_filesystem_read_prefetch": lambda: random.randint(0, 1),
+        "filesystem_cache_getorset_batch_size": lambda: random.randint(0, 3, 10, 50),
+        "read_from_filesystem_cache_if_exists_otherwise_bypass_cache": lambda: random.randint(0, 1),
+        "throw_on_error_from_cache_on_write_operations": lambda: random.randint(0, 1),
         "remote_filesystem_read_prefetch": lambda: random.randint(0, 1),
         "allow_prefetched_read_pool_for_remote_filesystem": lambda: random.randint(
             0, 1
diff --git a/tests/config/config.d/s3_storage_policy_by_default.xml b/tests/config/config.d/s3_storage_policy_by_default.xml
index e161c2ee01a..dd93a317a77 100644
--- a/tests/config/config.d/s3_storage_policy_by_default.xml
+++ b/tests/config/config.d/s3_storage_policy_by_default.xml
@@ -12,7 +12,6 @@
                 <max_size>1Gi</max_size>
                 <path>cached_s3/</path>
                 <disk>s3</disk>
-                <filesystem_cache_getorset_batch_size>10</filesystem_cache_getorset_batch_size>
             </cached_s3>
         </disks>
         <policies>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 9e3b235515d..d76949fadc7 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -151,6 +151,7 @@ if [[ -n "$EXPORT_S3_STORAGE_POLICIES" ]]; then
 
     ln -sf $SRC_PATH/config.d/storage_conf.xml $DEST_SERVER_PATH/config.d/
     ln -sf $SRC_PATH/users.d/s3_cache.xml $DEST_SERVER_PATH/users.d/
+    ln -sf $SRC_PATH/users.d/s3_cache_new.xml $DEST_SERVER_PATH/users.d/
 fi
 
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
diff --git a/tests/config/users.d/s3_cache_new.xml b/tests/config/users.d/s3_cache_new.xml
new file mode 100644
index 00000000000..638b7267960
--- /dev/null
+++ b/tests/config/users.d/s3_cache_new.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <profiles>
+        <default>
+          <filesystem_cache_getorset_batch_size>10</filesystem_cache_getorset_batch_size>
+        </default>
+    </profiles>
+</clickhouse>