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

*DbObject#CalculateConfigHash(): sort groups to be hashed

Browse Source 
... to ensure consistent hashes across config reloads.

This will likely cause a heavy update once for all objects in >1 group,
but it will ensure that this happens the last time.
This commit is contained in:
Alexander A. Klimov 2020-10-13 13:47:49 +02:00
parent e9b8fc234b
commit cb00a7fd6a
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/db_ido/hostdbobject.cpp
View File

@ -356,8 +356,12 @@ String HostDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields) co
Array::Ptr groups = host->GetGroups(); Array::Ptr groups = host->GetGroups();
if (groups) if (groups) {
groups = groups->ShallowClone();
ObjectLock oLock (groups);
std::sort(groups->Begin(), groups->End());
hashData += DbObject::HashValue(groups); hashData += DbObject::HashValue(groups);
}
ArrayData parents; ArrayData parents;

6
lib/db_ido/servicedbobject.cpp
View File

@ -308,8 +308,12 @@ String ServiceDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields)
Array::Ptr groups = service->GetGroups(); Array::Ptr groups = service->GetGroups();
if (groups) if (groups) {
groups = groups->ShallowClone();
ObjectLock oLock (groups);
std::sort(groups->Begin(), groups->End());
hashData += DbObject::HashValue(groups); hashData += DbObject::HashValue(groups);
}
ArrayData dependencies; ArrayData dependencies;

6
lib/db_ido/userdbobject.cpp
View File

@ -150,8 +150,12 @@ String UserDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields) co
Array::Ptr groups = user->GetGroups(); Array::Ptr groups = user->GetGroups();
if (groups) if (groups) {
groups = groups->ShallowClone();
ObjectLock oLock (groups);
std::sort(groups->Begin(), groups->End());
hashData += DbObject::HashValue(groups); hashData += DbObject::HashValue(groups);
}
return SHA256(hashData); return SHA256(hashData);
} }