From ed89af22b27d14ee3e694bfd7b504921ab58d45e Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 12 May 2021 16:31:29 +0300
Subject: [PATCH] Move jepsen tests to clickhouse-keeper

---
 .../jepsen.clickhouse-keeper/resources/config.xml |  1 -
 .../resources/keeper_config.xml                   |  8 ++++++++
 .../jepsen.clickhouse-keeper/resources/listen.xml |  3 ---
 .../jepsen.clickhouse-keeper/resources/users.xml  |  1 -
 .../src/jepsen/clickhouse_keeper/db.clj           |  7 ++-----
 .../src/jepsen/clickhouse_keeper/utils.clj        | 15 ++++++---------
 6 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 120000 tests/jepsen.clickhouse-keeper/resources/config.xml
 delete mode 100644 tests/jepsen.clickhouse-keeper/resources/listen.xml
 delete mode 120000 tests/jepsen.clickhouse-keeper/resources/users.xml

diff --git a/tests/jepsen.clickhouse-keeper/resources/config.xml b/tests/jepsen.clickhouse-keeper/resources/config.xml
deleted file mode 120000
index c7596baa075..00000000000
--- a/tests/jepsen.clickhouse-keeper/resources/config.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../programs/server/config.xml
\ No newline at end of file
diff --git a/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml b/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
index 528ea5d77be..f06d9683990 100644
--- a/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
+++ b/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
@@ -1,4 +1,12 @@
 <yandex>
+    <listen_host>::</listen_host>
+
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
+        <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
+    </logger>
+
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>{id}</server_id>
diff --git a/tests/jepsen.clickhouse-keeper/resources/listen.xml b/tests/jepsen.clickhouse-keeper/resources/listen.xml
deleted file mode 100644
index de8c737ff75..00000000000
--- a/tests/jepsen.clickhouse-keeper/resources/listen.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<yandex>
-    <listen_host>::</listen_host>
-</yandex>
diff --git a/tests/jepsen.clickhouse-keeper/resources/users.xml b/tests/jepsen.clickhouse-keeper/resources/users.xml
deleted file mode 120000
index 41b137a130f..00000000000
--- a/tests/jepsen.clickhouse-keeper/resources/users.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../programs/server/users.xml
\ No newline at end of file
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
index fdb6b233fec..30c2c0eaf4f 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
@@ -89,10 +89,7 @@
 
 (defn install-configs
   [test node]
-  (c/exec :echo (slurp (io/resource "config.xml")) :> (str configs-dir "/config.xml"))
-  (c/exec :echo (slurp (io/resource "users.xml")) :> (str configs-dir "/users.xml"))
-  (c/exec :echo (slurp (io/resource "listen.xml")) :> (str sub-configs-dir "/listen.xml"))
-  (c/exec :echo (cluster-config test node (slurp (io/resource "keeper_config.xml"))) :> (str sub-configs-dir "/keeper_config.xml")))
+  (c/exec :echo (cluster-config test node (slurp (io/resource "keeper_config.xml"))) :> (str configs-dir "/keeper_config.xml")))
 
 (defn collect-traces
   [test node]
@@ -144,7 +141,7 @@
            (info node "Coordination files exists, going to compress")
            (c/cd data-dir
                  (c/exec :tar :czf "coordination.tar.gz" "coordination")))))
-      (let [common-logs [stderr-file (str logs-dir "/clickhouse-server.log") (str data-dir "/coordination.tar.gz")]
+      (let [common-logs [stderr-file (str logs-dir "/clickhouse-keeper.log") (str data-dir "/coordination.tar.gz")]
             gdb-log (str logs-dir "/gdb.log")]
         (if (cu/exists? (str logs-dir "/gdb.log"))
           (conj common-logs gdb-log)
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
index 70813457251..0457ff6eae2 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/utils.clj
@@ -143,7 +143,7 @@
   [node test]
   (info "Checking server alive on" node)
   (try
-    (c/exec binary-path :client :--query "SELECT 1")
+    (zk-connect (name node) 9181 30000)
     (catch Exception _ false)))
 
 (defn wait-clickhouse-alive!
@@ -169,16 +169,13 @@
      :logfile stderr-file
      :chdir data-dir}
     binary-path
-    :server
-    :--config (str configs-dir "/config.xml")
+    :keeper
+    :--config (str configs-dir "/keeper_config.xml")
     :--
-    :--path (str data-dir "/")
-    :--user_files_path (str data-dir "/user_files")
-    :--top_level_domains_path (str data-dir "/top_level_domains")
-    :--logger.log (str logs-dir "/clickhouse-server.log")
-    :--logger.errorlog (str logs-dir "/clickhouse-server.err.log")
+    :--logger.log (str logs-dir "/clickhouse-keeper.log")
+    :--logger.errorlog (str logs-dir "/clickhouse-keeper.err.log")
     :--keeper_server.snapshot_storage_path coordination-snapshots-dir
-    :--keeper_server.logs_storage_path coordination-logs-dir)
+    :--keeper_server.log_storage_path coordination-logs-dir)
    (wait-clickhouse-alive! node test)))
 
 (defn md5 [^String s]