do not show a service as queued if not configured

The check if a service is configured has precedence over the check if
a service is already processed by the manager.
This fixes a bug where a service could be shown as queued even if he
was meant to be ignored.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/HA/Tools.pm b/src/PVE/HA/Tools.pm
index 565c2753d532a0a003c8126c8f1bec6e7271883b..0f49bc5e8986772d58139b2eb72daafe5bfbeff9 100644 (file)
--- a/src/PVE/HA/Tools.pm
+++ b/src/PVE/HA/Tools.pm
@@ -186,13 +186,13 @@ sub count_fenced_services {
 sub get_verbose_service_state {
     my ($service_state, $service_conf) = @_;
 
 sub get_verbose_service_state {
     my ($service_state, $service_conf) = @_;
 

+    my $req = $service_conf->{state} // 'ignored';
+    return 'ignored' if $req eq 'ignored';
+

     # service not yet processed by manager
     return 'queued' if !defined($service_state);
     my $cur = $service_state->{state};
 
     # service not yet processed by manager
     return 'queued' if !defined($service_state);
     my $cur = $service_state->{state};
 

-    return 'ignore' if !defined($service_conf) || !defined($service_conf->{state});
-    my $req = $service_conf->{state};
-

     # give fast feedback to the user
     my $state = $cur;
     if (!defined($cur)) {
     # give fast feedback to the user
     my $state = $cur;
     if (!defined($cur)) {