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

Icinga DB: priorize state > config 

I.e. do the following in parallel (highest priority first):

* Stream state changes to icinga:runtime:state
* Sync config and initial state,
  then let queued runtime updates to the just synced state pass
This commit is contained in:
Alexander A. Klimov 2021-07-26 16:39:18 +02:00
parent 8a30657ce9
commit ae9b371128
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/icingadb/icingadb-objects.cpp
View File

@ -136,10 +136,10 @@ void IcingaDB::UpdateAllConfigObjects()
std::vector<Type::Ptr> types = GetTypes(); std::vector<Type::Ptr> types = GetTypes();
m_Rcon->SuppressQueryKind(Prio::CheckResult); m_Rcon->SuppressQueryKind(Prio::CheckResult);
m_Rcon->SuppressQueryKind(Prio::State); m_Rcon->SuppressQueryKind(Prio::RuntimeStateSync);
Defer unSuppress ([this]() { Defer unSuppress ([this]() {
m_Rcon->UnsuppressQueryKind(Prio::State); m_Rcon->UnsuppressQueryKind(Prio::RuntimeStateSync);
m_Rcon->UnsuppressQueryKind(Prio::CheckResult); m_Rcon->UnsuppressQueryKind(Prio::CheckResult);
}); });
@ -1078,8 +1078,8 @@ void IcingaDB::UpdateState(const Checkable::Ptr& checkable)
Dictionary::Ptr stateAttrs = SerializeState(checkable); Dictionary::Ptr stateAttrs = SerializeState(checkable);
m_Rcon->FireAndForgetQuery({"HSET", m_PrefixConfigObject + objectType + ":state", objectKey, JsonEncode(stateAttrs)}, Prio::State); m_Rcon->FireAndForgetQuery({"HSET", m_PrefixConfigObject + objectType + ":state", objectKey, JsonEncode(stateAttrs)}, Prio::RuntimeStateSync);
m_Rcon->FireAndForgetQuery({"HSET", m_PrefixConfigCheckSum + objectType + ":state", objectKey, JsonEncode(new Dictionary({{"checksum", HashValue(stateAttrs)}}))}, Prio::State); m_Rcon->FireAndForgetQuery({"HSET", m_PrefixConfigCheckSum + objectType + ":state", objectKey, JsonEncode(new Dictionary({{"checksum", HashValue(stateAttrs)}}))}, Prio::RuntimeStateSync);
} }
@ -1101,8 +1101,8 @@ void IcingaDB::SendConfigUpdate(const ConfigObject::Ptr& object, bool runtimeUpd
Dictionary::Ptr state = SerializeState(checkable); Dictionary::Ptr state = SerializeState(checkable);
String checksum = HashValue(state); String checksum = HashValue(state);
m_Rcon->FireAndForgetQuery({"HSET", m_PrefixConfigObject + typeName + ":state", objectKey, JsonEncode(state)}, Prio::State); m_Rcon->FireAndForgetQuery({"HSET", m_PrefixConfigObject + typeName + ":state", objectKey, JsonEncode(state)}, Prio::RuntimeStateSync);
m_Rcon->FireAndForgetQuery({"HSET", m_PrefixConfigCheckSum + typeName + ":state", objectKey, JsonEncode(new Dictionary({{"checksum", checksum}}))}, Prio::State); m_Rcon->FireAndForgetQuery({"HSET", m_PrefixConfigCheckSum + typeName + ":state", objectKey, JsonEncode(new Dictionary({{"checksum", checksum}}))}, Prio::RuntimeStateSync);
if (runtimeUpdate) { if (runtimeUpdate) {
state->Set("checksum", checksum); state->Set("checksum", checksum);
@ -1539,7 +1539,7 @@ void IcingaDB::SendStatusUpdate(const ConfigObject::Ptr& object, const CheckResu
streamadd.emplace_back(IcingaToStreamValue(kv.second)); streamadd.emplace_back(IcingaToStreamValue(kv.second));
} }
m_Rcon->FireAndForgetQuery(std::move(streamadd), Prio::State); m_Rcon->FireAndForgetQuery(std::move(streamadd), Prio::RuntimeStateStream);
int hard_state; int hard_state;
if (!cr) { if (!cr) {

2
lib/icingadb/icingadb.cpp
View File

@ -76,7 +76,7 @@ void IcingaDB::Start(bool runtimeCreated)
m_WorkQueue.SetName("IcingaDB"); m_WorkQueue.SetName("IcingaDB");
m_Rcon->SuppressQueryKind(Prio::CheckResult); m_Rcon->SuppressQueryKind(Prio::CheckResult);
m_Rcon->SuppressQueryKind(Prio::State); m_Rcon->SuppressQueryKind(Prio::RuntimeStateSync);
} }
void IcingaDB::ExceptionHandler(boost::exception_ptr exp) void IcingaDB::ExceptionHandler(boost::exception_ptr exp)

5
lib/icingadb/redisconnection.hpp
View File

@ -62,8 +62,9 @@ namespace icinga
enum class QueryPriority : unsigned char enum class QueryPriority : unsigned char
{ {
Heartbeat, Heartbeat,
Config, RuntimeStateStream, // runtime state updates, doesn't affect initially synced states
State, Config, // includes initially synced states
RuntimeStateSync, // updates initially synced states at runtime, in parallel to config dump, therefore must be < Config
History, History,
CheckResult, CheckResult,
SyncConnection = 255 SyncConnection = 255