tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

IDO: Use own transaction for program status and make sure InternalNewTransaction() gets executed
This commit is contained in:
Alexander Aleksandrovič Klimov 2021-05-20 11:49:07 +02:00 committed by GitHub
parent 8150b0656e f551e95338
commit 0156434b2e
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;
DbQuery query1;
query1.Table = "programstatus";
query1.IdColumn = "programstatus_id";
query1.Type = DbQueryInsert | DbQueryDelete;
query1.Category = DbCatProgramStatus;
query1.Type = DbQueryNewTransaction;
query1.Priority = PriorityImmediate;
queries.emplace_back(std::move(query1));
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 */
{ "program_version", Application::GetAppVersion() },
{ "status_update_time", DbValue::FromTimestamp(Utility::GetTime()) },
@ -175,27 +180,26 @@ void DbConnection::UpdateProgramStatus()
{ "process_performance_data", (icingaApplication->GetEnablePerfdata() ? 1 : 0) }
});
query1.WhereCriteria = new Dictionary({
query2.WhereCriteria = new Dictionary({
{ "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));
DbQuery query3;
query3.Type = DbQueryNewTransaction;
queries.emplace_back(std::move(query3));
DbObject::OnMultipleQueries(queries);
DbQuery query3;
query3.Table = "runtimevariables";
query3.Type = DbQueryDelete;
query3.Category = DbCatProgramStatus;
query3.WhereCriteria = new Dictionary({
DbQuery query4;
query4.Table = "runtimevariables";
query4.Type = DbQueryDelete;
query4.Category = DbCatProgramStatus;
query4.WhereCriteria = new Dictionary({
{ "instance_id", 0 } /* DbConnection class fills in real ID */
});
DbObject::OnQuery(query3);
DbObject::OnQuery(query4);
InsertRuntimeVariable("total_services", ConfigType::Get<Service>()->GetObjectCount());
InsertRuntimeVariable("total_scheduled_services", ConfigType::Get<Service>()->GetObjectCount());

5
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -160,8 +160,7 @@ void IdoMysqlConnection::NewTransaction()
<< "Scheduling new transaction and finishing async queries.";
#endif /* I2_DEBUG */
m_QueryQueue.Enqueue([this]() { InternalNewTransaction(); }, PriorityNormal);
m_QueryQueue.Enqueue([this]() { FinishAsyncQueries(); }, PriorityNormal);
m_QueryQueue.Enqueue([this]() { InternalNewTransaction(); }, PriorityHigh);
}
void IdoMysqlConnection::InternalNewTransaction()
@ -175,6 +174,8 @@ void IdoMysqlConnection::InternalNewTransaction()
AsyncQuery("COMMIT");
AsyncQuery("BEGIN");
FinishAsyncQueries();
}
void IdoMysqlConnection::ReconnectTimerHandler()