thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix clickhouse keeper jepsen tests

Browse Source
This commit is contained in:
alesapin 2021-08-25 19:15:56 +03:00
parent 884b51116d
commit ea5fbbedec
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/keeper/Keeper.cpp
View File

@ -300,9 +300,9 @@ int Keeper::main(const std::vector<std::string> & /*args*/)
if (config().has("keeper_server.storage_path")) if (config().has("keeper_server.storage_path"))
path = config().getString("keeper_server.storage_path"); path = config().getString("keeper_server.storage_path");
else if (config().has("keeper_server.log_storage_path")) else if (config().has("keeper_server.log_storage_path"))
path = config().getString("keeper_server.log_storage_path"); path = std::filesystem::path(config().getString("keeper_server.log_storage_path")).parent_path();
else if (config().has("keeper_server.snapshot_storage_path")) else if (config().has("keeper_server.snapshot_storage_path"))
path = config().getString("keeper_server.snapshot_storage_path"); path = std::filesystem::path(config().getString("keeper_server.snapshot_storage_path")).parent_path();
else else
path = std::filesystem::path{KEEPER_DEFAULT_PATH}; path = std::filesystem::path{KEEPER_DEFAULT_PATH};

1
tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
View File

@ -68,6 +68,7 @@
(do (do
(c/exec :mkdir :-p common-prefix) (c/exec :mkdir :-p common-prefix)
(c/exec :mkdir :-p data-dir) (c/exec :mkdir :-p data-dir)
(c/exec :mkdir :-p coordination-data-dir)
(c/exec :mkdir :-p logs-dir) (c/exec :mkdir :-p logs-dir)
(c/exec :mkdir :-p configs-dir) (c/exec :mkdir :-p configs-dir)
(c/exec :mkdir :-p sub-configs-dir) (c/exec :mkdir :-p sub-configs-dir)