tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

RedisWriter#UpdateAllConfigObjects(): use one transaction per config object type

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

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

@ -30,6 +30,7 @@
#include "base/initialize.hpp"
#include "base/convert.hpp"
#include "base/array.hpp"
#include <map>
#include <set>
using namespace icinga;
@ -52,7 +53,7 @@ void RedisWriter::UpdateAllConfigObjects(void)
double startTime = Utility::GetTime();
std::vector<String> deleteQuery({ "DEL" });
std::map<Type*, std::vector<String>> deleteQueries;
long long cursor = 0;
const String keyPrefix = "icinga:config:";
@ -93,22 +94,29 @@ void RedisWriter::UpdateAllConfigObjects(void)
if (!ctype)
continue;
auto& deleteQuery = deleteQueries[ptype.get()];
if (deleteQuery.empty())
deleteQuery.emplace_back("DEL");
deleteQuery.push_back("icinga:config:" + type + ":" + name);
deleteQuery.push_back("icinga:status:" + type + ":" + name);
}
} while (cursor != 0);
ExecuteQuery({ "MULTI" });
if (deleteQuery.size() > 1)
ExecuteQuery(deleteQuery);
for (const Type::Ptr& type : Type::GetAllTypes()) {
ConfigType *ctype = dynamic_cast<ConfigType *>(type.get());
if (!ctype)
continue;
ExecuteQuery({ "MULTI" });
auto& deleteQuery = deleteQueries[type.get()];
if (deleteQuery.size() > 1)
ExecuteQuery(deleteQuery);
String typeName = type->GetName().ToLower();
/* replace into aka delete insert is faster than a full diff */
@ -122,9 +130,9 @@ void RedisWriter::UpdateAllConfigObjects(void)
/* publish config type dump finished */
ExecuteQuery({ "PUBLISH", "icinga:config:dump", typeName });
}
ExecuteQuery({ "EXEC" });
ExecuteQuery({ "EXEC" });
}
Log(LogInformation, "RedisWriter")
<< "Initial config/status dump finished in " << Utility::GetTime() - startTime << " seconds.";