Merge pull request #52861 from vitlibar/clickhouse-keeper-same-defaul…

…t-paths Use the same default paths for clickhouse_keeper (symlink) as for clickhouse_keeper (executable)
ClickHouse · Aug 5, 2023 · 80254c4 · 80254c4
2 parents 6825b00 + f55fe91
commit 80254c4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/programs/keeper/Keeper.cpp b/programs/keeper/Keeper.cpp
@@ -288,13 +288,27 @@ try
     std::string path;
 
     if (config().has("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"))
+    {
         path = std::filesystem::path(config().getString("keeper_server.log_storage_path")).parent_path();
+    }
     else if (config().has("keeper_server.snapshot_storage_path"))
+    {
         path = std::filesystem::path(config().getString("keeper_server.snapshot_storage_path")).parent_path();
+    }
     else
-        path = std::filesystem::path{KEEPER_DEFAULT_PATH};
+    {
+        path = KEEPER_DEFAULT_PATH;
+    }
 
     std::filesystem::create_directories(path);
 
@@ -330,6 +344,7 @@ try
     auto global_context = Context::createGlobal(shared_context.get());
 
     global_context->makeGlobalContext();
+    global_context->setApplicationType(Context::ApplicationType::KEEPER);
     global_context->setPath(path);
     global_context->setRemoteHostFilter(config());
 
@@ -365,7 +380,7 @@ try
     }
 
     /// Initialize keeper RAFT. Do nothing if no keeper_server in config.
-    global_context->initializeKeeperDispatcher(/* start_async = */ true);
+    global_context->initializeKeeperDispatcher(/* start_async = */ false);
     FourLetterCommandFactory::registerCommands(*global_context->getKeeperDispatcher());
 
     auto config_getter = [&] () -> const Poco::Util::AbstractConfiguration &

diff --git a/src/Coordination/Standalone/Context.h b/src/Coordination/Standalone/Context.h
@@ -98,6 +98,14 @@ class Context : public std::enable_shared_from_this<Context>
     std::shared_ptr<FilesystemCacheLog> getFilesystemCacheLog() const;
     std::shared_ptr<FilesystemReadPrefetchesLog> getFilesystemReadPrefetchesLog() const;
 
+    enum class ApplicationType
+    {
+        KEEPER
+    };
+
+    void setApplicationType(ApplicationType) {}
+    ApplicationType getApplicationType() const { return ApplicationType::KEEPER; }
+
     IAsynchronousReader & getThreadPoolReader(FilesystemReaderType type) const;
     std::shared_ptr<AsyncReadCounters> getAsyncReadCounters() const;
     ThreadPool & getThreadPoolWriter() const;