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

fix a race condition

Browse Source
This commit is contained in:
Alexander Tokmakov 2023-02-16 14:41:18 +01:00
parent a96d6af17e
commit 9feb448a5e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/local/LocalServer.cpp
View File

@ -654,8 +654,8 @@ void LocalServer::processConfig()
if (!config().has("only-system-tables")) if (!config().has("only-system-tables"))
{ {
DatabaseCatalog::instance().startupBackgroundCleanup();
loadMetadata(global_context); loadMetadata(global_context);
DatabaseCatalog::instance().loadDatabases();
} }
/// For ClickHouse local if path is not set the loader will be disabled. /// For ClickHouse local if path is not set the loader will be disabled.

2
programs/server/Server.cpp
View File

@ -1656,11 +1656,11 @@ try
/// that may execute DROP before loadMarkedAsDroppedTables() in background, /// that may execute DROP before loadMarkedAsDroppedTables() in background,
/// and so loadMarkedAsDroppedTables() will find it and try to add, and UUID will overlap. /// and so loadMarkedAsDroppedTables() will find it and try to add, and UUID will overlap.
database_catalog.loadMarkedAsDroppedTables(); database_catalog.loadMarkedAsDroppedTables();
database_catalog.startupBackgroundCleanup();
/// Then, load remaining databases /// Then, load remaining databases
loadMetadata(global_context, default_database); loadMetadata(global_context, default_database);
convertDatabasesEnginesIfNeed(global_context); convertDatabasesEnginesIfNeed(global_context);
startupSystemTables(); startupSystemTables();
database_catalog.loadDatabases();
/// After loading validate that default database exists /// After loading validate that default database exists
database_catalog.assertDatabaseExists(default_database); database_catalog.assertDatabaseExists(default_database);
/// Load user-defined SQL functions. /// Load user-defined SQL functions.

2
src/Interpreters/DatabaseCatalog.cpp
View File

@ -152,7 +152,7 @@ void DatabaseCatalog::initializeAndLoadTemporaryDatabase()
attachDatabase(TEMPORARY_DATABASE, db_for_temporary_and_external_tables); attachDatabase(TEMPORARY_DATABASE, db_for_temporary_and_external_tables);
} }
void DatabaseCatalog::loadDatabases() void DatabaseCatalog::startupBackgroundCleanup()
{ {
if (Context::getGlobalContextInstance()->getApplicationType() == Context::ApplicationType::SERVER && unused_dir_cleanup_period_sec) if (Context::getGlobalContextInstance()->getApplicationType() == Context::ApplicationType::SERVER && unused_dir_cleanup_period_sec)
{ {

2
src/Interpreters/DatabaseCatalog.h
View File

@ -136,7 +136,7 @@ public:
static void shutdown(); static void shutdown();
void initializeAndLoadTemporaryDatabase(); void initializeAndLoadTemporaryDatabase();
void loadDatabases(); void startupBackgroundCleanup();
void loadMarkedAsDroppedTables(); void loadMarkedAsDroppedTables();
/// Get an object that protects the table from concurrently executing multiple DDL operations. /// Get an object that protects the table from concurrently executing multiple DDL operations.