tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 05:34:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate DbConnection#m_QueryQueue.Join() in #Pause()

Browse Source 
refs #8727
This commit is contained in:
Alexander A. Klimov 2021-04-20 18:31:02 +02:00
parent 40c0bfad23
commit fd9bdb798d
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/db_ido/dbconnection.cpp
View File

@ -112,6 +112,9 @@ void DbConnection::Pause()
NewTransaction(); NewTransaction();
/* Work on remaining tasks but never delete the threads, for HA resuming later. */
m_QueryQueue.Join();
ConfigObject::Pause(); ConfigObject::Pause();
} }

3
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -107,9 +107,6 @@ void IdoMysqlConnection::Pause()
m_QueryQueue.Enqueue([this]() { Disconnect(); }, PriorityLow); m_QueryQueue.Enqueue([this]() { Disconnect(); }, PriorityLow);
/* Work on remaining tasks but never delete the threads, for HA resuming later. */
m_QueryQueue.Join();
Log(LogInformation, "IdoMysqlConnection") Log(LogInformation, "IdoMysqlConnection")
<< "'" << GetName() << "' paused."; << "'" << GetName() << "' paused.";

3
lib/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -106,9 +106,6 @@ void IdoPgsqlConnection::Pause()
m_QueryQueue.Enqueue([this]() { Disconnect(); }, PriorityLow); m_QueryQueue.Enqueue([this]() { Disconnect(); }, PriorityLow);
/* Work on remaining tasks but never delete the threads, for HA resuming later. */
m_QueryQueue.Join();
Log(LogInformation, "IdoPgsqlConnection") Log(LogInformation, "IdoPgsqlConnection")
<< "'" << GetName() << "' paused."; << "'" << GetName() << "' paused.";
} }