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

Merge pull request #8810 from Icinga/bugfix/mysql-one-transaction-for-programstatus-2.11

Browse Source 
IDO: Use own transaction for program status and make sure InternalNewTransaction() gets executed
This commit is contained in:
Alexander Aleksandrovič Klimov 2021-05-26 15:46:56 +02:00 committed by GitHub
commit 0bf2c78cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/db_ido/dbconnection.cpp
View File

@ -150,12 +150,17 @@ void DbConnection::UpdateProgramStatus()
std::vector<DbQuery> queries; std::vector<DbQuery> queries;
DbQuery query1; DbQuery query1;
query1.Table = "programstatus"; query1.Type = DbQueryNewTransaction;
query1.IdColumn = "programstatus_id"; query1.Priority = PriorityImmediate;
query1.Type = DbQueryInsert | DbQueryDelete; queries.emplace_back(std::move(query1));
query1.Category = DbCatProgramStatus;
query1.Fields = new Dictionary({ DbQuery query2;
query2.Table = "programstatus";
query2.IdColumn = "programstatus_id";
query2.Type = DbQueryInsert | DbQueryDelete;
query2.Category = DbCatProgramStatus;
query2.Fields = new Dictionary({
{ "instance_id", 0 }, /* DbConnection class fills in real ID */ { "instance_id", 0 }, /* DbConnection class fills in real ID */
{ "program_version", Application::GetAppVersion() }, { "program_version", Application::GetAppVersion() },
{ "status_update_time", DbValue::FromTimestamp(Utility::GetTime()) }, { "status_update_time", DbValue::FromTimestamp(Utility::GetTime()) },
@ -175,27 +180,26 @@ void DbConnection::UpdateProgramStatus()
{ "process_performance_data", (icingaApplication->GetEnablePerfdata() ? 1 : 0) } { "process_performance_data", (icingaApplication->GetEnablePerfdata() ? 1 : 0) }
}); });
query1.WhereCriteria = new Dictionary({ query2.WhereCriteria = new Dictionary({
{ "instance_id", 0 } /* DbConnection class fills in real ID */ { "instance_id", 0 } /* DbConnection class fills in real ID */
}); });
query1.Priority = PriorityImmediate;
queries.emplace_back(std::move(query1));
DbQuery query2;
query2.Type = DbQueryNewTransaction;
queries.emplace_back(std::move(query2)); queries.emplace_back(std::move(query2));
DbQuery query3;
query3.Type = DbQueryNewTransaction;
queries.emplace_back(std::move(query3));
DbObject::OnMultipleQueries(queries); DbObject::OnMultipleQueries(queries);
DbQuery query3; DbQuery query4;
query3.Table = "runtimevariables"; query4.Table = "runtimevariables";
query3.Type = DbQueryDelete; query4.Type = DbQueryDelete;
query3.Category = DbCatProgramStatus; query4.Category = DbCatProgramStatus;
query3.WhereCriteria = new Dictionary({ query4.WhereCriteria = new Dictionary({
{ "instance_id", 0 } /* DbConnection class fills in real ID */ { "instance_id", 0 } /* DbConnection class fills in real ID */
}); });
DbObject::OnQuery(query3); DbObject::OnQuery(query4);
InsertRuntimeVariable("total_services", ConfigType::Get<Service>()->GetObjectCount()); InsertRuntimeVariable("total_services", ConfigType::Get<Service>()->GetObjectCount());
InsertRuntimeVariable("total_scheduled_services", ConfigType::Get<Service>()->GetObjectCount()); InsertRuntimeVariable("total_scheduled_services", ConfigType::Get<Service>()->GetObjectCount());

5
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -165,8 +165,7 @@ void IdoMysqlConnection::NewTransaction()
<< "Scheduling new transaction and finishing async queries."; << "Scheduling new transaction and finishing async queries.";
#endif /* I2_DEBUG */ #endif /* I2_DEBUG */
m_QueryQueue.Enqueue(std::bind(&IdoMysqlConnection::InternalNewTransaction, this), PriorityNormal); m_QueryQueue.Enqueue(std::bind(&IdoMysqlConnection::InternalNewTransaction, this), PriorityHigh);
m_QueryQueue.Enqueue(std::bind(&IdoMysqlConnection::FinishAsyncQueries, this), PriorityNormal);
} }
void IdoMysqlConnection::InternalNewTransaction() void IdoMysqlConnection::InternalNewTransaction()
@ -180,6 +179,8 @@ void IdoMysqlConnection::InternalNewTransaction()
AsyncQuery("COMMIT"); AsyncQuery("COMMIT");
AsyncQuery("BEGIN"); AsyncQuery("BEGIN");
FinishAsyncQueries();
} }
void IdoMysqlConnection::ReconnectTimerHandler() void IdoMysqlConnection::ReconnectTimerHandler()