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 #10065 from Icinga/heavy-update-missing-table-relations 

Update `object#config_hash` after all relations queries
This commit is contained in:
Alexander Aleksandrovič Klimov 2024-05-22 15:38:31 +02:00 committed by GitHub
parent 1bdfc6fb89 1019398d55
commit cc3965c3ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/db_ido/dbobject.cpp
View File

@ -119,6 +119,14 @@ void DbObject::SendConfigUpdateHeavy(const Dictionary::Ptr& configFields)
ASSERT(configFields->Contains("config_hash")); ASSERT(configFields->Contains("config_hash"));
Value configHash = configFields->Get("config_hash");
// Since all the child tables are relying on the inserted parent ID, we first need to insert/update the
// configuration fields of the current object without the actual config_hash value. Having the config hash
// set only after all relation queries eliminates some rare race conditions where e.g. host group members
// are not written to the database because Icinga 2 / the DBMS was unexpectedly stopped/reloaded shortly
// after the config_hash column was updated.
configFields->Set("config_hash", Empty);
ConfigObject::Ptr object = GetObject(); ConfigObject::Ptr object = GetObject();
DbQuery query; DbQuery query;
@ -138,7 +146,22 @@ void DbObject::SendConfigUpdateHeavy(const Dictionary::Ptr& configFields)
m_LastConfigUpdate = Utility::GetTime(); m_LastConfigUpdate = Utility::GetTime();
// Trigger config heavy udpates of the child classes.
OnConfigUpdateHeavy(); OnConfigUpdateHeavy();
// Now update the config hash attribute of the current object.
DbQuery configHashQuery;
configHashQuery.Table = GetType()->GetTable() + "s";
configHashQuery.Type = DbQueryUpdate;
configHashQuery.Category = DbCatConfig;
configHashQuery.Fields = new Dictionary({{"config_hash", configHash}});
configHashQuery.Object = this;
configHashQuery.ConfigUpdate = true;
configHashQuery.WhereCriteria = new Dictionary({{GetType()->GetIDColumn(), object}});
OnQuery(configHashQuery);
// Lastly, update some common configs that do not affect the config_hash column.
OnConfigUpdateLight();
} }
void DbObject::SendConfigUpdateLight() void DbObject::SendConfigUpdateLight()

2
lib/db_ido/hostdbobject.cpp
View File

@ -330,8 +330,6 @@ void HostDbObject::OnConfigUpdateHeavy()
} }
DbObject::OnMultipleQueries(queries); DbObject::OnMultipleQueries(queries);
DoCommonConfigUpdate();
} }
void HostDbObject::OnConfigUpdateLight() void HostDbObject::OnConfigUpdateLight()

2
lib/db_ido/servicedbobject.cpp
View File

@ -282,8 +282,6 @@ void ServiceDbObject::OnConfigUpdateHeavy()
} }
DbObject::OnMultipleQueries(queries); DbObject::OnMultipleQueries(queries);
DoCommonConfigUpdate();
} }
void ServiceDbObject::OnConfigUpdateLight() void ServiceDbObject::OnConfigUpdateLight()