From b43ee9b7a090e25a0bdee49cfdf88c763a965897 Mon Sep 17 00:00:00 2001
From: raoptimus <resmus@gmail.com>
Date: Tue, 3 Dec 2024 16:12:58 +0300
Subject: [PATCH] adding experimental replicated function to clickhouse #40

---
 docker-compose.yml                                     | 10 +++++-----
 .../config/clickhouse1/use_keeper.xml                  |  2 +-
 .../config/clickhouse2/use_keeper.xml                  |  2 +-
 .../config/keeper1/keeper_config.xml                   |  9 ++++-----
 .../config/keeper1/keeper_config.xml                   |  7 +++----
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 521129b..e670216 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -67,12 +67,12 @@ services:
     depends_on:
       - clickhouse-keeper
 
-  clickhouse-r-keeper:
+  clickhouse-keeper-r:
     image: clickhouse/clickhouse-keeper:23.11-alpine
     restart: on-failure
     volumes:
-      - "./docker/volume/clickhouse-cluster/config/keeper1/keeper_config.xml:/etc/clickhouse-keeper/keeper_config.xml"
-  
+      - "./docker/volume/clickhouse-cluster-replicated/config/keeper1/keeper_config.xml:/etc/clickhouse-keeper/keeper_config.xml"
+
   clickhouse-r-1:
     image: clickhouse/clickhouse-server:23.11-alpine
     restart: on-failure
@@ -80,7 +80,7 @@ services:
       - "./docker/volume/clickhouse-cluster-replicated/config/clickhouse1:/etc/clickhouse-server/config.d/"
       - "./docker/volume/clickhouse-cluster-replicated/config/clickhouse1/users.xml:/etc/clickhouse-server/users.d/users.xml"
     depends_on:
-      - clickhouse-r-keeper
+      - clickhouse-keeper-r
 
   clickhouse-r-2:
     image: clickhouse/clickhouse-server:23.11-alpine
@@ -89,4 +89,4 @@ services:
       - "./docker/volume/clickhouse-cluster-replicated/config/clickhouse2:/etc/clickhouse-server/config.d/"
       - "./docker/volume/clickhouse-cluster-replicated/config/clickhouse2/users.xml:/etc/clickhouse-server/users.d/users.xml"
     depends_on:
-      - clickhouse-r-keeper
+      - clickhouse-keeper-r
diff --git a/docker/volume/clickhouse-cluster-replicated/config/clickhouse1/use_keeper.xml b/docker/volume/clickhouse-cluster-replicated/config/clickhouse1/use_keeper.xml
index 07e2ea4..493225a 100644
--- a/docker/volume/clickhouse-cluster-replicated/config/clickhouse1/use_keeper.xml
+++ b/docker/volume/clickhouse-cluster-replicated/config/clickhouse1/use_keeper.xml
@@ -1,7 +1,7 @@
 <clickhouse>
     <zookeeper>
         <node>
-            <host>clickhouse-keeper</host>
+            <host>clickhouse-keeper-r</host>
             <port>9181</port>
         </node>
     </zookeeper>
diff --git a/docker/volume/clickhouse-cluster-replicated/config/clickhouse2/use_keeper.xml b/docker/volume/clickhouse-cluster-replicated/config/clickhouse2/use_keeper.xml
index 07e2ea4..493225a 100644
--- a/docker/volume/clickhouse-cluster-replicated/config/clickhouse2/use_keeper.xml
+++ b/docker/volume/clickhouse-cluster-replicated/config/clickhouse2/use_keeper.xml
@@ -1,7 +1,7 @@
 <clickhouse>
     <zookeeper>
         <node>
-            <host>clickhouse-keeper</host>
+            <host>clickhouse-keeper-r</host>
             <port>9181</port>
         </node>
     </zookeeper>
diff --git a/docker/volume/clickhouse-cluster-replicated/config/keeper1/keeper_config.xml b/docker/volume/clickhouse-cluster-replicated/config/keeper1/keeper_config.xml
index e0c97dd..4a9eb9d 100644
--- a/docker/volume/clickhouse-cluster-replicated/config/keeper1/keeper_config.xml
+++ b/docker/volume/clickhouse-cluster-replicated/config/keeper1/keeper_config.xml
@@ -1,9 +1,8 @@
 <clickhouse replace="true">
     <logger>
-        <level>information</level>
-        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
-        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
-        <size>1000M</size>
+        <level>error</level>
+        <console>1</console>
+        <size>10M</size>
         <count>3</count>
     </logger>
     <listen_host>0.0.0.0</listen_host>
@@ -20,7 +19,7 @@
         <raft_configuration>
             <server>
                 <id>1</id>
-                <hostname>clickhouse-keeper</hostname>
+                <hostname>clickhouse-keeper-r</hostname>
                 <port>9234</port>
             </server>
         </raft_configuration>
diff --git a/docker/volume/clickhouse-cluster/config/keeper1/keeper_config.xml b/docker/volume/clickhouse-cluster/config/keeper1/keeper_config.xml
index e0c97dd..61661d7 100644
--- a/docker/volume/clickhouse-cluster/config/keeper1/keeper_config.xml
+++ b/docker/volume/clickhouse-cluster/config/keeper1/keeper_config.xml
@@ -1,9 +1,8 @@
 <clickhouse replace="true">
     <logger>
-        <level>information</level>
-        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
-        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
-        <size>1000M</size>
+        <level>error</level>
+        <console>1</console>
+        <size>10M</size>
         <count>3</count>
     </logger>
     <listen_host>0.0.0.0</listen_host>