Fixed SIGABRT in ConfigReloader. [#CLICKHOUSE-3443]

This commit is contained in:
Vitaliy Lyudvichenko 2018-01-15 15:24:48 +03:00
parent 1b82615be6
commit 9ed1fdbbac

View File

@ -53,11 +53,18 @@ void ConfigReloader::run()
while (true)
{
bool zk_changed = zk_node_cache.getChangedEvent().tryWait(std::chrono::milliseconds(reload_interval).count());
if (quit)
return;
try
{
bool zk_changed = zk_node_cache.getChangedEvent().tryWait(std::chrono::milliseconds(reload_interval).count());
if (quit)
return;
reloadIfNewer(zk_changed, /* throw_on_error = */ false, /* fallback_to_preprocessed = */ false);
reloadIfNewer(zk_changed, /* throw_on_error = */ false, /* fallback_to_preprocessed = */ false);
}
catch (...)
{
tryLogCurrentException(log, __PRETTY_FUNCTION__);
}
}
}