Unreachable parent optimizations (#1126)

Icinga · Jan 15, 2025 · b52c219 · b52c219
2 parents 02ff5d8 + 0b51376
commit b52c219
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/library/Icingadb/Model/UnreachableParent.php b/library/Icingadb/Model/UnreachableParent.php
@@ -5,6 +5,7 @@
 namespace Icinga\Module\Icingadb\Model;
 
 use Icinga\Module\Icingadb\Model\Behavior\ReRoute;
+use Icinga\Module\Icingadb\Model\UnreachableParent\ResultSet;
 use InvalidArgumentException;
 use ipl\Orm\Behavior\Binary;
 use ipl\Orm\Behaviors;
@@ -112,6 +113,8 @@ public static function on(Connection $db, Model $root = null): Query
             )
         ));
 
+        $query->setResultSetClass(ResultSet::class);
+
         return $query;
     }
 
@@ -161,10 +164,7 @@ private static function selectNodes(Connection $db, Model $root): Select
                 'redundancy_group_id' => 'to.redundancy_group_id',
                 'is_group_member' => new Expression('urn.redundancy_group_id IS NOT NULL AND urn.level > 0')
             ]);
-        $nodeQuery->filter(Filter::any(
-            Filter::equal('state.failed', 'y'),
-            Filter::equal('to.redundancy_group.state.failed', 'y')
-        ));
+        $nodeQuery->filter(Filter::equal('state.failed', 'y'));
 
         $nodeSelect = $nodeQuery->assembleSelect();
 

diff --git a/library/Icingadb/Model/UnreachableParent/ResultSet.php b/library/Icingadb/Model/UnreachableParent/ResultSet.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Icinga\Module\Icingadb\Model\UnreachableParent;
+
+use Icinga\Module\Icingadb\Redis\VolatileStateResults;
+use Traversable;
+
+class ResultSet extends VolatileStateResults
+{
+    protected function yieldTraversable(Traversable $traversable)
+    {
+        $knownIds = [];
+        foreach ($traversable as $value) {
+            if (isset($knownIds[$value->id])) {
+                continue;
+            }
+
+            $knownIds[$value->id] = true;
+
+            yield $value;
+        }
+    }
+}
diff --git a/library/Icingadb/Widget/Detail/ObjectDetail.php b/library/Icingadb/Widget/Detail/ObjectDetail.php
@@ -655,7 +655,6 @@ protected function createRootProblems(): ?array
                 'service.host',
                 'service.host.state'
             ])
-            ->setResultSetClass(VolatileStateResults::class)
             ->orderBy([
                 'host.state.severity',
                 'host.state.last_state_change',