From d1a958d41a62bbd71007ac389a9adf46106c3728 Mon Sep 17 00:00:00 2001
From: pufit <pufit@clickhouse.com>
Date: Tue, 6 Aug 2024 21:12:21 -0400
Subject: [PATCH 1/3] Let's add one .xml file and see what happens

---
 tests/config/config.d/replicated_access_storage.xml | 10 ++++++++++
 tests/config/install.sh                             |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 tests/config/config.d/replicated_access_storage.xml

diff --git a/tests/config/config.d/replicated_access_storage.xml b/tests/config/config.d/replicated_access_storage.xml
new file mode 100644
index 00000000000..b4d385451d1
--- /dev/null
+++ b/tests/config/config.d/replicated_access_storage.xml
@@ -0,0 +1,10 @@
+<clickhouse>
+    <user_directories replace="replace">
+        <replicated>
+            <zookeeper_path>/clickhouse/access</zookeeper_path>
+        </replicated>
+        <users_xml>
+            <path>users.xml</path>
+        </users_xml>
+    </user_directories>
+</clickhouse>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 7c4b36dc4bd..444db3dda0a 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -70,6 +70,7 @@ ln -sf $SRC_PATH/config.d/block_number.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/handlers.yaml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/serverwide_trace_collector.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/rocksdb.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/replicated_access_storage.xml $DEST_SERVER_PATH/config.d/
 
 # Not supported with fasttest.
 if [ "${DEST_SERVER_PATH}" = "/etc/clickhouse-server" ]

From b938eea72c936cd490cadc5daa87602b5d271a79 Mon Sep 17 00:00:00 2001
From: pufit <pufit@clickhouse.com>
Date: Thu, 8 Aug 2024 21:53:32 -0400
Subject: [PATCH 2/3] will not enable replicated access storage without
 replicated database

---
 tests/config/install.sh                                       | 4 +++-
 .../0_stateless/02884_create_view_with_sql_security_option.sh | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/config/install.sh b/tests/config/install.sh
index 444db3dda0a..20e0263e5c1 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -70,7 +70,9 @@ ln -sf $SRC_PATH/config.d/block_number.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/handlers.yaml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/serverwide_trace_collector.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/rocksdb.xml $DEST_SERVER_PATH/config.d/
-ln -sf $SRC_PATH/config.d/replicated_access_storage.xml $DEST_SERVER_PATH/config.d/
+
+if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
+    ln -sf $SRC_PATH/config.d/replicated_access_storage.xml $DEST_SERVER_PATH/config.d/
 
 # Not supported with fasttest.
 if [ "${DEST_SERVER_PATH}" = "/etc/clickhouse-server" ]
diff --git a/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh b/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh
index cc4e76a9ed9..e505a0431a4 100755
--- a/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh
+++ b/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Tags: no-replicated-database
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh

From 227914cf39efbc71b77ed4482d593febe767dd55 Mon Sep 17 00:00:00 2001
From: pufit <pufit@clickhouse.com>
Date: Fri, 9 Aug 2024 00:27:16 -0400
Subject: [PATCH 3/3] fix syntax error

---
 tests/config/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/config/install.sh b/tests/config/install.sh
index 20e0263e5c1..28807e05646 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -73,6 +73,7 @@ ln -sf $SRC_PATH/config.d/rocksdb.xml $DEST_SERVER_PATH/config.d/
 
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
     ln -sf $SRC_PATH/config.d/replicated_access_storage.xml $DEST_SERVER_PATH/config.d/
+fi
 
 # Not supported with fasttest.
 if [ "${DEST_SERVER_PATH}" = "/etc/clickhouse-server" ]