thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix keeper default path check

Browse Source
This commit is contained in:
pufit 2023-08-17 22:07:39 -04:00
parent b9df41d5e3
commit 2e69a1d3a2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/keeper/Keeper.cpp
View File

@ -290,12 +290,6 @@ try
{ {
path = config().getString("keeper_server.storage_path"); path = config().getString("keeper_server.storage_path");
} }
else if (std::filesystem::is_directory(std::filesystem::path{config().getString("path", DBMS_DEFAULT_PATH)} / "coordination"))
{
throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG,
"By default 'keeper.storage_path' could be assigned to {}, but the directory {} already exists. Please specify 'keeper.storage_path' in the keeper configuration explicitly",
KEEPER_DEFAULT_PATH, String{std::filesystem::path{config().getString("path", DBMS_DEFAULT_PATH)} / "coordination"});
}
else if (config().has("keeper_server.log_storage_path")) else if (config().has("keeper_server.log_storage_path"))
{ {
path = std::filesystem::path(config().getString("keeper_server.log_storage_path")).parent_path(); path = std::filesystem::path(config().getString("keeper_server.log_storage_path")).parent_path();
@ -304,6 +298,12 @@ try
{ {
path = std::filesystem::path(config().getString("keeper_server.snapshot_storage_path")).parent_path(); path = std::filesystem::path(config().getString("keeper_server.snapshot_storage_path")).parent_path();
} }
else if (std::filesystem::is_directory(std::filesystem::path{config().getString("path", DBMS_DEFAULT_PATH)} / "coordination"))
{
throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG,
"By default 'keeper.storage_path' could be assigned to {}, but the directory {} already exists. Please specify 'keeper.storage_path' in the keeper configuration explicitly",
KEEPER_DEFAULT_PATH, String{std::filesystem::path{config().getString("path", DBMS_DEFAULT_PATH)} / "coordination"});
}
else else
{ {
path = KEEPER_DEFAULT_PATH; path = KEEPER_DEFAULT_PATH;