tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-29 08:34:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Checkable: Use redundancy groups state in IsReachable

Browse Source
This commit is contained in:
Yonas Habteab 2024-12-16 09:22:21 +01:00
parent 27f11a0955
commit d094581b4b
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/icinga/checkable-dependency.cpp
View File

@ -77,11 +77,6 @@ bool Checkable::IsReachable(DependencyType dt, int rstack) const
return false; return false;
} }
for (const Checkable::Ptr& checkable : GetParents()) {
if (!checkable->IsReachable(dt, rstack + 1))
return false;
}
/* implicit dependency on host if this is a service */ /* implicit dependency on host if this is a service */
const auto *service = dynamic_cast<const Service *>(this); const auto *service = dynamic_cast<const Service *>(this);
if (service && (dt == DependencyState || dt == DependencyNotification)) { if (service && (dt == DependencyState || dt == DependencyNotification)) {
@ -92,38 +87,16 @@ bool Checkable::IsReachable(DependencyType dt, int rstack) const
} }
} }
auto deps = GetDependencies(); for (auto& dependencyGroup : GetDependencyGroups()) {
if (auto state(dependencyGroup->GetState(dt, rstack + 1)); !state.Reachable || !state.OK) {
Log(LogDebug, "Checkable")
<< "Dependency group '" << dependencyGroup->GetRedundancyGroupName() << "' have failed for checkable '"
<< GetName() << "': Marking as unreachable.";
std::unordered_map<std::string, Dependency::Ptr> violated; // key: redundancy group, value: nullptr if satisfied, violating dependency otherwise return false;
for (const Dependency::Ptr& dep : deps) {
std::string redundancy_group = dep->GetRedundancyGroup();
if (!dep->IsAvailable(dt)) {
if (redundancy_group.empty()) {
Log(LogDebug, "Checkable")
<< "Non-redundant dependency '" << dep->GetName() << "' failed for checkable '" << GetName() << "': Marking as unreachable.";
return false;
}
// tentatively mark this dependency group as failed unless it is already marked;
// so it either passed before (don't overwrite) or already failed (so don't care)
// note that std::unordered_map::insert() will not overwrite an existing entry
violated.insert(std::make_pair(redundancy_group, dep));
} else if (!redundancy_group.empty()) {
violated[redundancy_group] = nullptr;
} }
} }
auto violator = std::find_if(violated.begin(), violated.end(), [](auto& v) { return v.second != nullptr; });
if (violator != violated.end()) {
Log(LogDebug, "Checkable")
<< "All dependencies in redundancy group '" << violator->first << "' have failed for checkable '" << GetName() << "': Marking as unreachable.";
return false;
}
return true; return true;
} }