On 9/30/19 9:22 AM, Fabian Ebner wrote:
> Signed-off-by: Fabian Ebner <f.eb...@proxmox.com>
> ---
> src/PVE/HA/LRM.pm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm
> index 3b4a572..e5eee94 100644
> --- a/src/PVE/HA/LRM.pm
> +++ b/src/PVE/HA/LRM.pm
> @@ -535,7 +535,7 @@ sub manage_resources {
> my $req_state = $sd->{state};
> next if !defined($req_state);
> next if $req_state eq 'freeze';
> - $self->queue_resource_command($sid, $sd->{uid}, $req_state, {'target'
> => $sd->{target}});
> + $self->queue_resource_command($sid, $sd->{uid}, $req_state, {'target'
> => $sd->{target}, 'timeout' => $sd->{timeout}});
> }
>
> return $self->run_workers();
> @@ -776,7 +776,7 @@ sub exec_resource_agent {
>
> $haenv->log("info", "stopping service $sid");
>
> - $plugin->shutdown($haenv, $id);
> + $plugin->shutdown($haenv, $id, $params->{timeout});
>
> $running = $plugin->check_running($haenv, $id);
>
>
I'd squash this into 05/12, does not has much use as a standalone patch,
I think 05 + 06 combined are single logical change.
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
