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

Code formatting

This commit is contained in:
Jean Flach 2018-10-26 16:33:22 +02:00 committed by Michael Friedrich
parent 1d21626b30
commit 36588ce31a
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,20 +66,22 @@ void RedisWriter::UpdateAllConfigObjects()
WorkQueue upq(25000, Configuration::Concurrency); WorkQueue upq(25000, Configuration::Concurrency);
upq.SetName("RedisWriter:ConfigDump"); upq.SetName("RedisWriter:ConfigDump");
typedef std::pair<ConfigType*, String> TypePair; typedef std::pair<ConfigType *, String> TypePair;
std::vector<TypePair> types; std::vector<TypePair> types;
for (const Type::Ptr& type : Type::GetAllTypes()) { for (const Type::Ptr& type : Type::GetAllTypes()) {
ConfigType *ctype = dynamic_cast<ConfigType *>(type.get()); ConfigType *ctype = dynamic_cast<ConfigType *>(type.get());
if (!ctype) if (!ctype)
continue; continue;
String lcType (type->GetName().ToLower()); String lcType(type->GetName().ToLower());
types.emplace_back(ctype, lcType); types.emplace_back(ctype, lcType);
m_Rcon->ExecuteQuery({"DEL", m_PrefixConfigCheckSum + lcType, m_PrefixConfigObject + lcType, m_PrefixStatusObject + lcType}); m_Rcon->ExecuteQuery(
{"DEL", m_PrefixConfigCheckSum + lcType, m_PrefixConfigObject + lcType, m_PrefixStatusObject + lcType});
} }
upq.ParallelFor(types, [this](const TypePair& type) { upq.ParallelFor(types, [this](const TypePair& type)
{
size_t bulkCounter = 0; size_t bulkCounter = 0;
auto attributes = std::vector<String>({"HMSET", m_PrefixConfigObject + type.second}); auto attributes = std::vector<String>({"HMSET", m_PrefixConfigObject + type.second});
auto customVars = std::vector<String>({"HMSET", m_PrefixConfigCustomVar + type.second}); auto customVars = std::vector<String>({"HMSET", m_PrefixConfigCustomVar + type.second});
@ -88,7 +90,7 @@ void RedisWriter::UpdateAllConfigObjects()
for (const ConfigObject::Ptr& object : type.first->GetObjects()) { for (const ConfigObject::Ptr& object : type.first->GetObjects()) {
CreateConfigUpdate(object, attributes, customVars, checksums, false); CreateConfigUpdate(object, attributes, customVars, checksums, false);
SendStatusUpdate(object); SendStatusUpdate(object);
bulkCounter ++; bulkCounter++;
if (!bulkCounter % 100) { if (!bulkCounter % 100) {
if (attributes.size() > 2) { if (attributes.size() > 2) {
m_Rcon->ExecuteQuery(attributes); m_Rcon->ExecuteQuery(attributes);
@ -112,7 +114,7 @@ void RedisWriter::UpdateAllConfigObjects()
m_Rcon->ExecuteQuery(checksums); m_Rcon->ExecuteQuery(checksums);
Log(LogNotice, "RedisWriter") Log(LogNotice, "RedisWriter")
<< "Dumped " << bulkCounter << " objects of type " << type.second; << "Dumped " << bulkCounter << " objects of type " << type.second;
}); });
upq.Join(); upq.Join();
@ -128,7 +130,7 @@ void RedisWriter::UpdateAllConfigObjects()
<< "Initial config/status dump finished in " << Utility::GetTime() - startTime << " seconds."; << "Initial config/status dump finished in " << Utility::GetTime() - startTime << " seconds.";
} }
template <typename ConfigType> template<typename ConfigType>
static ConfigObject::Ptr GetObjectByName(const String& name) static ConfigObject::Ptr GetObjectByName(const String& name)
{ {
return ConfigObject::GetObject<ConfigType>(name); return ConfigObject::GetObject<ConfigType>(name);
@ -154,7 +156,9 @@ void RedisWriter::SendConfigUpdate(const ConfigObject::Ptr& object, bool runtime
* (if applicable), first the key then the value. To use in a Redis command the command (e.g. HSET) and the key (e.g. * (if applicable), first the key then the value. To use in a Redis command the command (e.g. HSET) and the key (e.g.
* icinga:config:object:downtime) need to be prepended. There is nothing to indicate success or failure. * icinga:config:object:downtime) need to be prepended. There is nothing to indicate success or failure.
*/ */
void RedisWriter::CreateConfigUpdate(const ConfigObject::Ptr& object, std::vector<String>& attributes, std::vector<String>& customVars, std::vector<String>& checksums, bool runtimeUpdate) void RedisWriter::CreateConfigUpdate(const ConfigObject::Ptr& object, std::vector<String>& attributes,
std::vector<String>& customVars, std::vector<String>& checksums,
bool runtimeUpdate)
{ {
/* TODO: This isn't essentially correct as we don't keep track of config objects ourselves. This would avoid duplicated config updates at startup. /* TODO: This isn't essentially correct as we don't keep track of config objects ourselves. This would avoid duplicated config updates at startup.
if (!runtimeUpdate && m_ConfigDumpInProgress) if (!runtimeUpdate && m_ConfigDumpInProgress)
@ -501,10 +505,10 @@ void RedisWriter::SendConfigDelete(const ConfigObject::Ptr& object)
String objectKey = GetObjectIdentifier(object); String objectKey = GetObjectIdentifier(object);
m_Rcon->ExecuteQueries({ m_Rcon->ExecuteQueries({
{"HDEL", m_PrefixConfigObject + typeName, objectKey}, {"HDEL", m_PrefixConfigObject + typeName, objectKey},
{"DEL", m_PrefixStatusObject + typeName + ":" + objectKey}, {"DEL", m_PrefixStatusObject + typeName + ":" + objectKey},
{"PUBLISH", "icinga:config:delete", typeName + ":" + objectKey} {"PUBLISH", "icinga:config:delete", typeName + ":" + objectKey}
}); });
} }
void RedisWriter::SendStatusUpdate(const ConfigObject::Ptr& object) void RedisWriter::SendStatusUpdate(const ConfigObject::Ptr& object)
@ -592,8 +596,9 @@ void RedisWriter::SendStatusUpdate(const ConfigObject::Ptr& object)
// } // }
} }
std::vector<String> RedisWriter::UpdateObjectAttrs(const String& keyPrefix, const ConfigObject::Ptr& object, int fieldType, std::vector<String>
const String& typeNameOverride) RedisWriter::UpdateObjectAttrs(const String& keyPrefix, const ConfigObject::Ptr& object, int fieldType,
const String& typeNameOverride)
{ {
Type::Ptr type = object->GetReflectionType(); Type::Ptr type = object->GetReflectionType();
Dictionary::Ptr attrs(new Dictionary); Dictionary::Ptr attrs(new Dictionary);