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

DB IDO: Fix problem with hostgroup_members cleanup 

fixes #11103
This commit is contained in:
Michael Friedrich 2016-02-08 11:05:27 +01:00
parent 6d5014b610
commit 99dbb249de
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/db_ido/hostdbobject.cpp
View File

@ -189,15 +189,16 @@ void HostDbObject::OnConfigUpdate(void)
BOOST_FOREACH(const String& groupName, groups) { BOOST_FOREACH(const String& groupName, groups) {
HostGroup::Ptr group = HostGroup::GetByName(groupName); HostGroup::Ptr group = HostGroup::GetByName(groupName);
std::vector<DbQuery> queries;
DbQuery query1; DbQuery query1;
query1.Table = DbType::GetByName("HostGroup")->GetTable() + "_members"; query1.Table = DbType::GetByName("HostGroup")->GetTable() + "_members";
query1.Type = DbQueryDelete; query1.Type = DbQueryDelete;
query1.Category = DbCatConfig; query1.Category = DbCatConfig;
query1.WhereCriteria = new Dictionary(); query1.WhereCriteria = new Dictionary();
query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */ query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
query1.WhereCriteria->Set("hostgroup_id", DbValue::FromObjectInsertID(group));
query1.WhereCriteria->Set("host_object_id", host); query1.WhereCriteria->Set("host_object_id", host);
OnQuery(query1); queries.push_back(query1);
DbQuery query2; DbQuery query2;
query2.Table = DbType::GetByName("HostGroup")->GetTable() + "_members"; query2.Table = DbType::GetByName("HostGroup")->GetTable() + "_members";
@ -207,7 +208,9 @@ void HostDbObject::OnConfigUpdate(void)
query2.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */ query2.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */
query2.Fields->Set("hostgroup_id", DbValue::FromObjectInsertID(group)); query2.Fields->Set("hostgroup_id", DbValue::FromObjectInsertID(group));
query2.Fields->Set("host_object_id", host); query2.Fields->Set("host_object_id", host);
OnQuery(query2); queries.push_back(query2);
DbObject::OnMultipleQueries(queries);
} }
} }

9
lib/db_ido/servicedbobject.cpp
View File

@ -188,15 +188,16 @@ void ServiceDbObject::OnConfigUpdate(void)
BOOST_FOREACH(const String& groupName, groups) { BOOST_FOREACH(const String& groupName, groups) {
ServiceGroup::Ptr group = ServiceGroup::GetByName(groupName); ServiceGroup::Ptr group = ServiceGroup::GetByName(groupName);
std::vector<DbQuery> queries;
DbQuery query1; DbQuery query1;
query1.Table = DbType::GetByName("ServiceGroup")->GetTable() + "_members"; query1.Table = DbType::GetByName("ServiceGroup")->GetTable() + "_members";
query1.Type = DbQueryDelete; query1.Type = DbQueryDelete;
query1.Category = DbCatConfig; query1.Category = DbCatConfig;
query1.WhereCriteria = new Dictionary(); query1.WhereCriteria = new Dictionary();
query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */ query1.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
query1.WhereCriteria->Set("servicegroup_id", DbValue::FromObjectInsertID(group));
query1.WhereCriteria->Set("service_object_id", service); query1.WhereCriteria->Set("service_object_id", service);
OnQuery(query1); queries.push_back(query1);
DbQuery query2; DbQuery query2;
query2.Table = DbType::GetByName("ServiceGroup")->GetTable() + "_members"; query2.Table = DbType::GetByName("ServiceGroup")->GetTable() + "_members";
@ -206,7 +207,9 @@ void ServiceDbObject::OnConfigUpdate(void)
query2.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */ query2.Fields->Set("instance_id", 0); /* DbConnection class fills in real ID */
query2.Fields->Set("servicegroup_id", DbValue::FromObjectInsertID(group)); query2.Fields->Set("servicegroup_id", DbValue::FromObjectInsertID(group));
query2.Fields->Set("service_object_id", service); query2.Fields->Set("service_object_id", service);
OnQuery(query2); queries.push_back(query2);
DbObject::OnMultipleQueries(queries);
} }
} }