Re: [PATCH manager 07/19] vzdump: stop all running backup jobs of the node

[Fiona Ebner <f.ebner@proxmox.com>]

Am 01.11.26 um 11:59 PM schrieb Thomas Lamprecht:
> @@ -1566,26 +1561,26 @@ sub verify_vzdump_parameters {
>  }
>  
>  sub stop_running_backups {
> -    my ($self) = @_;
> +    my $nodename = PVE::INotify::nodename();
>  
> -    my $upid = PVE::Tools::file_read_firstline($pidfile);
> -    return if !$upid;
> +    my $running = [];
> +    for my $worker (PVE::RPCEnvironment::get()->active_workers()->@*) {
> +        my $task = PVE::Tools::upid_decode($worker->{upid}, 1) or next;

Nit: could use PVE::UPID

> +        next if $task->{type} ne 'vzdump' || $task->{node} ne $nodename;
> +        next if !PVE::ProcFSTools::check_process_running($task->{pid}, $task->{pstart});
>  
> -    my $task = PVE::Tools::upid_decode($upid);
> +        # the whole process group, like stopping the task does
> +        kill(15, -$task->{pid});
> +        push $running->@*, $task;
> +    }
>  
> -    if (
> -        PVE::ProcFSTools::check_process_running($task->{pid}, $task->{pstart})
> -        && PVE::ProcFSTools::read_proc_starttime($task->{pid}) == $task->{pstart}
> -    ) {
> -        kill(15, $task->{pid});
> -        # wait max 15 seconds to shut down (else, do nothing for now)
> -        my $i;
> -        for ($i = 15; $i > 0; $i--) {
> -            last if !PVE::ProcFSTools::check_process_running(($task->{pid}, $task->{pstart}));
> -            sleep(1);
> -        }
> -        die "stopping backup process $task->{pid} failed\n" if $i == 0;
> +    for (1 .. 15) {
> +        $running = [grep { PVE::ProcFSTools::check_process_running($_->{pid}, $_->{pstart}) }
> +            $running->@*];
> +        return if !scalar($running->@*);
> +        sleep(1);
>      }
> +    die "stopping backup process " . join(', ', map { $_->{pid} } $running->@*) . " failed\n";

Nit: could say "process(es)" or conditionally use singular/plural

>  }
>  
>  sub get_included_guests {