[PATCH ha-manager v2 6/7] manager: remove failed nodes earlier in select_service_node

[Daniel Kral <d.kral@proxmox.com>]

This is done in preparation of an upcoming patch, which moves the
maintenance node fallback behavior logic up as well, so move up the
failed nodes earlier here as well to maintain it.

This does not change the behavior of select_service_node(), because the
now subsequent random migrations check is only done if the
$node_preference = 'none', while the failed nodes are only removed in
$node_preference = 'try-next'.

Suggested-by: Michael Köppl <m.koeppl@proxmox.com>
Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
changes since v1:
- new!

 src/PVE/HA/Manager.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index 3c768a86..b2b74282 100644
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -367,6 +367,13 @@ sub select_service_node {
 
     my ($allowed_nodes, $pri_nodes) = get_node_affinity($node_affinity, $sid, $online_nodes);
 
+    # try to avoid nodes where the HA resource failed already if we want to relocate
+    if ($node_preference eq 'try-next') {
+        for my $node (@$tried_nodes) {
+            delete $pri_nodes->{$node};
+        }
+    }
+
     return undef if !%$pri_nodes;
 
     # stay on current node if possible (avoids random migrations)
@@ -381,13 +388,6 @@ sub select_service_node {
         return $current_node;
     }
 
-    # try to avoid nodes where the service failed already if we want to relocate
-    if ($node_preference eq 'try-next') {
-        foreach my $node (@$tried_nodes) {
-            delete $pri_nodes->{$node};
-        }
-    }
-
     return $maintenance_fallback
         if defined($maintenance_fallback) && $pri_nodes->{$maintenance_fallback};
 
-- 
2.47.3