tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-22 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

RedisWriter: fix disappeared config objects not being deleted

Browse Source
This commit is contained in:
Alexander A. Klimov 2018-06-22 17:57:36 +02:00 committed by Michael Friedrich
parent e7411ea158
commit d15769fa34
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,11 @@ void RedisWriter::UpdateAllConfigObjects(void)
const String keyPrefix = "icinga:config:"; const String keyPrefix = "icinga:config:";
std::map<String, String> lcTypes;
for (const Type::Ptr& type : Type::GetAllTypes()) {
lcTypes.emplace(type->GetName().ToLower(), type->GetName());
}
do { do {
std::shared_ptr<redisReply> reply = ExecuteQuery({ "SCAN", Convert::ToString(cursor), "MATCH", keyPrefix + "*", "COUNT", "1000" }); std::shared_ptr<redisReply> reply = ExecuteQuery({ "SCAN", Convert::ToString(cursor), "MATCH", keyPrefix + "*", "COUNT", "1000" });
@ -84,16 +89,12 @@ void RedisWriter::UpdateAllConfigObjects(void)
String type = namePair.SubStr(0, pos); String type = namePair.SubStr(0, pos);
String name = namePair.SubStr(pos + 1); String name = namePair.SubStr(pos + 1);
Type::Ptr ptype = Type::GetByName(type); auto actualTypeName = lcTypes.find(type);
if (!ptype) if (actualTypeName == lcTypes.end())
continue;
ConfigType *ctype = dynamic_cast<ConfigType *>(ptype.get());
if (!ctype)
continue; continue;
Type::Ptr ptype = Type::GetByName(actualTypeName->second);
auto& deleteQuery = deleteQueries[ptype.get()]; auto& deleteQuery = deleteQueries[ptype.get()];
if (deleteQuery.empty()) if (deleteQuery.empty())