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

Merge pull request #26079 from ClickHouse/fix_abort

Browse Source 
Fix abort in ZooKeeper client
This commit is contained in:
alesapin 2021-07-08 22:58:28 +03:00 committed by GitHub
commit c34a769143
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Common/ZooKeeper/ZooKeeperImpl.cpp
View File

@ -853,7 +853,8 @@ void ZooKeeper::finalize(bool error_send, bool error_receive)
}
/// Send thread will exit after sending close request or on expired flag
send_thread.join();
if (send_thread.joinable())
send_thread.join();
}
/// Set expired flag after we sent close event
@ -870,7 +871,7 @@ void ZooKeeper::finalize(bool error_send, bool error_receive)
tryLogCurrentException(__PRETTY_FUNCTION__);
}
if (!error_receive)
if (!error_receive && receive_thread.joinable())
receive_thread.join();
{