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

Sync ranges_checksum for timeperiods 

Signed-off-by: Michael Friedrich <michael.friedrich@icinga.com>
This commit is contained in:
Jean Flach 2018-07-26 15:55:50 +02:00 committed by Michael Friedrich
parent 3e0a2f59e2
commit c70316a835
3 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/redis/rediswriter-objects.cpp
View File

@ -28,6 +28,7 @@
#include "icinga/checkcommand.hpp"
#include "icinga/eventcommand.hpp"
#include "icinga/notificationcommand.hpp"
#include "icinga/timeperiod.hpp"
#include "remote/zone.hpp"
#include "base/json.hpp"
#include "base/logger.hpp"
@ -158,6 +159,11 @@ static ConfigObject::Ptr GetUserGroup(const String& name)
return ConfigObject::GetObject<UserGroup>(name);
}
static ConfigObject::Ptr GetClude(const String& name)
{
return ConfigObject::GetObject<TimePeriod>(name);
}
void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, bool useTransaction, bool runtimeUpdate)
{
AssertOnWorkQueue();
@ -217,7 +223,7 @@ void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, bool useTran
groups = user->GetGroups();
getGroup = &::GetUserGroup;
checkSums->Set("groups_checksum", CalculateCheckSumGroups(groups));
checkSums->Set("groups_checksum", CalculateCheckSumArray(groups));
Array::Ptr groupChecksums = new Array();
@ -257,7 +263,7 @@ void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, bool useTran
getGroup = &::GetHostGroup;
}
checkSums->Set("groups_checksum", CalculateCheckSumGroups(groups));
checkSums->Set("groups_checksum", CalculateCheckSumArray(groups));
Array::Ptr groupChecksums = new Array();
@ -310,7 +316,7 @@ void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, bool useTran
endpoints->Set(i++, endpointObject->GetName());
}
checkSums->Set("endpoints_checksum", CalculateCheckSumGroups(endpoints));
checkSums->Set("endpoints_checksum", CalculateCheckSumArray(endpoints));
Zone::Ptr parentZone = zone->GetParent();
@ -351,6 +357,55 @@ void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, bool useTran
checkSums->Set("envvars_checksum", HashValue(envvars));
checkSums->Set("envvar_checksums", envvarChecksums);
propertiesBlacklist.emplace("env");
} else {
auto timeperiod (dynamic_pointer_cast<TimePeriod>(object));
if (timeperiod) {
Dictionary::Ptr ranges = timeperiod->GetRanges();
checkSums->Set("ranges_checksum", HashValue(ranges));
propertiesBlacklist.emplace("ranges");
// Compute checksums for Includes (like groups)
Array::Ptr includes;
ConfigObject::Ptr (*getInclude)(const String& name);
includes = timeperiod->GetIncludes();
getInclude = &::GetClude;
checkSums->Set("includes_checksum", CalculateCheckSumArray(includes));
Array::Ptr includeChecksums = new Array();
ObjectLock includesLock (includes);
ObjectLock includeChecksumsLock (includeChecksums);
for (auto include : includes) {
includeChecksums->Add(GetIdentifier((*getInclude)(include.Get<String>())));
}
checkSums->Set("include_checksums", includeChecksums);
// Compute checksums for Excludes (like groups)
Array::Ptr excludes;
ConfigObject::Ptr (*getExclude)(const String& name);
excludes = timeperiod->GetExcludes();
getExclude = &::GetClude;
checkSums->Set("excludes_checksum", CalculateCheckSumArray(excludes));
Array::Ptr excludeChecksums = new Array();
ObjectLock excludesLock (excludes);
ObjectLock excludeChecksumsLock (excludeChecksums);
for (auto exclude : excludes) {
excludeChecksums->Add(GetIdentifier((*getExclude)(exclude.Get<String>())));
}
checkSums->Set("exclude_checksums", excludeChecksums);
}
}
}
}

8
lib/redis/rediswriter-utility.cpp
View File

@ -59,14 +59,14 @@ String RedisWriter::CalculateCheckSumString(const String& str)
return SHA1(str);
}
String RedisWriter::CalculateCheckSumGroups(const Array::Ptr& groups)
String RedisWriter::CalculateCheckSumArray(const Array::Ptr& arr)
{
/* Ensure that checksums happen in a defined order. */
Array::Ptr tmpGroups = groups->ShallowClone();
Array::Ptr tmpArr = arr->ShallowClone();
tmpGroups->Sort();
tmpArr->Sort();
return SHA1(PackObject(tmpGroups));
return SHA1(PackObject(tmpArr));
}
String RedisWriter::CalculateCheckSumProperties(const ConfigObject::Ptr& object, const std::set<String>& propertiesBlacklist)

2
lib/redis/rediswriter.hpp
View File

@ -80,7 +80,7 @@ private:
static String GetIdentifier(const ConfigObject::Ptr& object);
static String GetEnvironment();
static String CalculateCheckSumString(const String& str);
static String CalculateCheckSumGroups(const Array::Ptr& groups);
static String CalculateCheckSumArray(const Array::Ptr& arr);
static String CalculateCheckSumProperties(const ConfigObject::Ptr& object, const std::set<String>& propertiesBlacklist);
static String CalculateCheckSumMetadata(const ConfigObject::Ptr& object);
static String CalculateCheckSumVars(const CustomVarObject::Ptr& object);