Avoid pathological delete mac for millions of nodes (S. Xu)

Netdisco/Changes

@@ -12,6 +12,7 @@
   * [#279] Web sessions use cookies instead of files on disk (M. Johnson)
   * Strip realm from username (B. Marshall)
   * Mention netdisco-users mail list in docs (C. Goldsmith)
+  * Avoid pathological delete mac for millions of nodes (S. Xu)
 
   [BUG FIXES]
 

Netdisco/lib/App/Netdisco/DB/ResultSet/Node.pm

@@ -116,10 +116,11 @@ sub delete {
         NodeNbt
       /) {
         $schema->resultset($set)->search({
-            '-and' => [
-              'me.mac' => { '-in' => $nodes->as_query },
           'me.mac' => { '-in' => $schema->resultset($set)->search({
+              '-and' => [
                 -bool => 'nodes.active',
+                'me.mac' => { '-in' => $nodes->as_query }
+              ]
             },
             {
               columns => 'mac',
@@ -128,7 +129,6 @@ sub delete {
               having => \[ 'count(nodes.mac) = 0' ],
             })->as_query,
           },
-            ],
         })->delete;
       }