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

Merge pull request #14105 from nikitamikhaylov/nm-better-update-timeout

Browse Source 
Fix hardcoded timeout
This commit is contained in:
Nikita Mikhaylov 2020-08-27 15:16:47 +04:00 committed by GitHub
commit badd5a00c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Dictionaries/CacheDictionary.cpp
View File

@ -798,10 +798,9 @@ void CacheDictionary::waitForCurrentUpdateFinish(UpdateUnitPtr & update_unit_ptr
{
std::unique_lock<std::mutex> update_lock(update_mutex);
size_t timeout_for_wait = 100000;
bool result = is_update_finished.wait_for(
update_lock,
std::chrono::milliseconds(timeout_for_wait),
std::chrono::milliseconds(query_wait_timeout_milliseconds),
[&] { return update_unit_ptr->is_done || update_unit_ptr->current_exception; });
if (!result)
@ -817,8 +816,8 @@ void CacheDictionary::waitForCurrentUpdateFinish(UpdateUnitPtr & update_unit_ptr
* */
update_unit_ptr->can_use_callback = false;
throw DB::Exception(ErrorCodes::TIMEOUT_EXCEEDED,
"Dictionary {} source seems unavailable, because {} timeout exceeded.",
getDictionaryID().getNameForLogs(), toString(timeout_for_wait));
"Dictionary {} source seems unavailable, because {}ms timeout exceeded.",
getDictionaryID().getNameForLogs(), toString(query_wait_timeout_milliseconds));
}