5
0
mirror of git://git.proxmox.com/git/pve-ha-manager.git synced 2025-02-02 13:47:16 +03:00

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>
This commit is contained in:
Thomas Lamprecht 2017-01-24 18:37:23 +01:00 committed by Fabian Grünbichler
parent 667670b2d4
commit dab49a14a0

View File

@ -186,13 +186,13 @@ sub count_fenced_services {
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};
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)) {