thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix logical race on dictionaries loading

Browse Source
This commit is contained in:
Alexander Tokmakov 2021-09-10 12:54:22 +03:00
parent 9e496910a0
commit d82a794e8c
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Interpreters/ExternalLoader.cpp
View File

@ -1198,8 +1198,8 @@ class ExternalLoader::PeriodicUpdater : private boost::noncopyable
public:
static constexpr UInt64 check_period_sec = 5;
PeriodicUpdater(LoadablesConfigReader & config_files_reader_, LoadingDispatcher & loading_dispatcher_)
: config_files_reader(config_files_reader_), loading_dispatcher(loading_dispatcher_)
PeriodicUpdater(LoadablesConfigReader & config_files_reader_, LoadingDispatcher & loading_dispatcher_, std::recursive_mutex & config_mutex_)
: config_files_reader(config_files_reader_), loading_dispatcher(loading_dispatcher_), config_mutex(config_mutex_)
{
}
@ -1242,8 +1242,11 @@ private:
while (!event.wait_for(lock, std::chrono::seconds(check_period_sec), pred))
{
lock.unlock();
{
std::lock_guard config_lock{config_mutex};
loading_dispatcher.setConfiguration(config_files_reader.read());
loading_dispatcher.reloadOutdated();
}
lock.lock();
}
}
@ -1251,6 +1254,7 @@ private:
LoadablesConfigReader & config_files_reader;
LoadingDispatcher & loading_dispatcher;
std::recursive_mutex & config_mutex;
mutable std::mutex mutex;
bool enabled = false;
ThreadFromGlobalPool thread;
@ -1264,7 +1268,7 @@ ExternalLoader::ExternalLoader(const String & type_name_, Poco::Logger * log_)
[this](auto && a, auto && b, auto && c) { return createObject(a, b, c); },
type_name_,
log_))
, periodic_updater(std::make_unique<PeriodicUpdater>(*config_files_reader, *loading_dispatcher))
, periodic_updater(std::make_unique<PeriodicUpdater>(*config_files_reader, *loading_dispatcher, config_mutex))
, type_name(type_name_)
, log(log_)
{
@ -1276,11 +1280,13 @@ scope_guard ExternalLoader::addConfigRepository(std::unique_ptr<IExternalLoaderC
{
auto * ptr = repository.get();
String name = ptr->getName();
std::lock_guard lock{config_mutex};
config_files_reader->addConfigRepository(std::move(repository));
reloadConfig(name);
return [this, ptr, name]()
{
std::lock_guard config_lock{config_mutex};
config_files_reader->removeConfigRepository(ptr);
reloadConfig(name);
};
@ -1379,7 +1385,10 @@ ReturnType ExternalLoader::load(const FilterByNameFunction & filter) const
template <typename ReturnType, typename>
ReturnType ExternalLoader::loadOrReload(const String & name) const
{
{
std::lock_guard lock{config_mutex};
loading_dispatcher->setConfiguration(config_files_reader->read());
}
auto result = loading_dispatcher->tryLoadOrReload<LoadResult>(name, WAIT);
checkLoaded(result, true);
return convertTo<ReturnType>(result);
@ -1388,7 +1397,10 @@ ReturnType ExternalLoader::loadOrReload(const String & name) const
template <typename ReturnType, typename>
ReturnType ExternalLoader::loadOrReload(const FilterByNameFunction & filter) const
{
{
std::lock_guard lock{config_mutex};
loading_dispatcher->setConfiguration(config_files_reader->read());
}
auto results = loading_dispatcher->tryLoadOrReload<LoadResults>(filter, WAIT);
checkLoaded(results, true);
return convertTo<ReturnType>(results);
@ -1476,16 +1488,19 @@ void ExternalLoader::checkLoaded(const ExternalLoader::LoadResults & results,
void ExternalLoader::reloadConfig() const
{
std::lock_guard lock{config_mutex};
loading_dispatcher->setConfiguration(config_files_reader->read());
}
void ExternalLoader::reloadConfig(const String & repository_name) const
{
std::lock_guard lock{config_mutex};
loading_dispatcher->setConfiguration(config_files_reader->read(repository_name));
}
void ExternalLoader::reloadConfig(const String & repository_name, const String & path) const
{
std::lock_guard lock{config_mutex};
loading_dispatcher->setConfiguration(config_files_reader->read(repository_name, path));
}

8
src/Interpreters/ExternalLoader.h
View File

@ -219,6 +219,14 @@ private:
LoadablePtr createObject(const String & name, const ObjectConfig & config, const LoadablePtr & previous_version) const;
/// We have to read configuration from LoadablesConfigReader and load configuration using LoadingDispatcher atomically.
/// Otherwise we can read configuration in one thread, then read and load newer configuration in another thread,
/// and then load outdated configuration from the first thread.
/// Remarkably, each class (LoadablesConfigReader, LoadingDispatcher, PeriodicUpdater) has own mutex for own purposes,
/// but it does not save from complex logical race conditions.
/// TODO Refactor dictionaries loading and get rid of this.
mutable std::recursive_mutex config_mutex;
class LoadablesConfigReader;
std::unique_ptr<LoadablesConfigReader> config_files_reader;