From 62ccbba0b76a1b6fff4bcf506ccc4013133ec4b4 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Fri, 6 Apr 2018 22:44:55 +0300 Subject: [PATCH] Avoid herd effect in ReplicatedMergeTreeCleanupThread (continued) [#CLICKHOUSE-2] --- contrib/poco | 2 +- .../Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/poco b/contrib/poco index 930a7ec1154..a107b0c9cee 160000 --- a/contrib/poco +++ b/contrib/poco @@ -1 +1 @@ -Subproject commit 930a7ec1154f4f9711edfb4b4a39f9fff2a5bbb5 +Subproject commit a107b0c9cee109fe0abfbf509df3c78a1e0c05fa diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp index e3d090f4212..7259b91ddd7 100644 --- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp +++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp @@ -27,8 +27,8 @@ void ReplicatedMergeTreeCleanupThread::run() { setThreadName("ReplMTCleanup"); - const auto CLEANUP_SLEEP_MS = (storage.data.settings.cleanup_delay_period - + std::uniform_int_distribution(0, storage.data.settings.cleanup_delay_period_random_add)(rng)) * 1000; + const auto CLEANUP_SLEEP_MS = storage.data.settings.cleanup_delay_period * 1000 + + std::uniform_int_distribution(0, storage.data.settings.cleanup_delay_period_random_add * 1000)(rng); while (!storage.shutdown_called) {