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

dbms: add try-catch around reloadFromFile in ExternalDictionaries.cpp [#METR-18128]

Browse Source
This commit is contained in:
Andrey Mironov 2015-09-22 18:15:19 +03:00
parent 0f6c2839c2
commit 666a33e435
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dbms/src/Interpreters/ExternalDictionaries.cpp
View File

@ -48,7 +48,19 @@ void ExternalDictionaries::reloadImpl(const bool throw_on_error)
const auto config_paths = getDictionariesConfigPaths(Poco::Util::Application::instance().config()); const auto config_paths = getDictionariesConfigPaths(Poco::Util::Application::instance().config());
for (const auto & config_path : config_paths) for (const auto & config_path : config_paths)
reloadFromFile(config_path, throw_on_error); {
try
{
reloadFromFile(config_path, throw_on_error);
}
catch (...)
{
tryLogCurrentException(log, "reloadFromFile has thrown while reading from " + config_path);
if (throw_on_error)
throw;
}
}
/// list of recreated dictionaries to perform delayed removal from unordered_map /// list of recreated dictionaries to perform delayed removal from unordered_map
std::list<std::string> recreated_failed_dictionaries; std::list<std::string> recreated_failed_dictionaries;
@ -101,6 +113,9 @@ void ExternalDictionaries::reloadImpl(const bool throw_on_error)
catch (...) catch (...)
{ {
tryLogCurrentException(log, "Failed reloading '" + name + "' dictionary"); tryLogCurrentException(log, "Failed reloading '" + name + "' dictionary");
if (throw_on_error)
throw;
} }
} }
@ -162,6 +177,9 @@ void ExternalDictionaries::reloadImpl(const bool throw_on_error)
dictionary.second.exception = std::current_exception(); dictionary.second.exception = std::current_exception();
tryLogCurrentException(log, "Cannot update external dictionary '" + name + "', leaving old version"); tryLogCurrentException(log, "Cannot update external dictionary '" + name + "', leaving old version");
if (throw_on_error)
throw;
} }
} }
} }