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

Fix refreshState logic

Browse Source
This commit is contained in:
Anton Ivashkin 2021-03-10 14:08:49 +03:00
parent aff13c0c52
commit deb0b83a12
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
View File

@ -116,8 +116,8 @@ void ReplicatedMergeTreeMergeStrategyPicker::refreshState()
auto now = time(nullptr);
/// the setting was already enabled, and last state refresh was done recently
if ((execute_merges_on_single_replica_time_threshold != 0
|| s3_execute_merges_on_single_replica_time_threshold != 0)
if (((threshold != 0 && execute_merges_on_single_replica_time_threshold != 0)
|| (threshold_s3 != 0 && s3_execute_merges_on_single_replica_time_threshold != 0))
&& now - last_refresh_time < REFRESH_STATE_MINIMUM_INTERVAL_SECONDS)
return;