thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-23 18:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix livelock with watch queries and database atomic

Browse Source
This commit is contained in:
Alexander Tokmakov 2020-05-12 21:10:10 +03:00
parent ff0ae624ef
commit 5ffb7372af
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Storages/LiveView/LiveViewBlockInputStream.h
View File

@ -46,7 +46,7 @@ public:
void cancel(bool kill) override
{
if (isCancelled() || storage->is_dropped)
if (isCancelled() || storage->shutdown_called)
return;
IBlockInputStream::cancel(kill);
std::lock_guard lock(storage->mutex);
@ -115,7 +115,7 @@ protected:
end = blocks->end();
}
if (isCancelled() || storage->is_dropped)
if (isCancelled() || storage->shutdown_called)
{
return { Block(), true };
}
@ -155,7 +155,7 @@ protected:
bool signaled = std::cv_status::no_timeout == storage->condition.wait_for(lock,
std::chrono::microseconds(std::max(UInt64(0), heartbeat_interval_usec - (timestamp_usec - last_event_timestamp_usec))));
if (isCancelled() || storage->is_dropped)
if (isCancelled() || storage->shutdown_called)
{
return { Block(), true };
}

6
src/Storages/LiveView/LiveViewEventsBlockInputStream.h
View File

@ -65,7 +65,7 @@ public:
void cancel(bool kill) override
{
if (isCancelled() || storage->is_dropped)
if (isCancelled() || storage->shutdown_called)
return;
IBlockInputStream::cancel(kill);
std::lock_guard lock(storage->mutex);
@ -149,7 +149,7 @@ protected:
end = blocks->end();
}
if (isCancelled() || storage->is_dropped)
if (isCancelled() || storage->shutdown_called)
{
return { Block(), true };
}
@ -190,7 +190,7 @@ protected:
bool signaled = std::cv_status::no_timeout == storage->condition.wait_for(lock,
std::chrono::microseconds(std::max(UInt64(0), heartbeat_interval_usec - (timestamp_usec - last_event_timestamp_usec))));
if (isCancelled() || storage->is_dropped)
if (isCancelled() || storage->shutdown_called)
{
return { Block(), true };
}

4
src/Storages/LiveView/StorageLiveView.cpp
View File

@ -468,6 +468,10 @@ void StorageLiveView::shutdown()
if (!shutdown_called.compare_exchange_strong(expected, true))
return;
/// WATCH queries should be stopped after setting shutdown_called to true.
/// Otherwise livelock is possible for LiveView table in Atomic database:
/// WATCH query will wait for table to be dropped and DatabaseCatalog will wait for queries to finish
{
std::lock_guard no_users_thread_lock(no_users_thread_mutex);
if (no_users_thread.joinable())