From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 66F686B6EF for ; Tue, 26 Jan 2021 19:23:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 54B881BB40 for ; Tue, 26 Jan 2021 19:23:25 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 2FAF51BB34 for ; Tue, 26 Jan 2021 19:23:24 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F38FF46113 for ; Tue, 26 Jan 2021 19:23:23 +0100 (CET) To: Proxmox VE development discussion , Stefan Reiter References: <20210114153921.16739-1-s.reiter@proxmox.com> From: Thomas Lamprecht Message-ID: <37a43b7e-1919-bc0b-ac84-08411c86bd4d@proxmox.com> Date: Tue, 26 Jan 2021 19:23:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:85.0) Gecko/20100101 Thunderbird/85.0 MIME-Version: 1.0 In-Reply-To: <20210114153921.16739-1-s.reiter@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL -0.065 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [restenvironment.pm] Subject: Re: [pve-devel] [PATCH common] allow longer timeout for cancelling 'vzdump' jobs X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2021 18:23:55 -0000 On 14.01.21 16:39, Stefan Reiter wrote: > This attempts to solve the issue where on slow network storages, > aborting a backup job (which may wait for buffers to flush) could take > longer than 5 seconds, and would thus result in the task being killed b= y > SIGKILL, not removing the backup lock in the process. >=20 > Make the implementation future-proof by using a map from task type to a= > timeout value. Default stays at 5, so tasks other than 'vzdump' are not= > affected. >=20 > Signed-off-by: Stefan Reiter > --- > src/PVE/RESTEnvironment.pm | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) >=20 Not to sure about that map there in pve-common, that module should stay r= ather agnostic of user special treatment. Did you thought about passing that explicitly on worker creation, or sett= ing it in the RPCEnv inside a worker? > diff --git a/src/PVE/RESTEnvironment.pm b/src/PVE/RESTEnvironment.pm > index d5b84d0..8a0cb9a 100644 > --- a/src/PVE/RESTEnvironment.pm > +++ b/src/PVE/RESTEnvironment.pm > @@ -365,8 +365,16 @@ sub active_workers { > return $res; > } > =20 > +my $timeout_map =3D { > + # backup cancellation on slow target storages might take a while, = avoid > + # leaving the VM in locked state > + "vzdump" =3D> 60, > +}; > + > my $kill_process_group =3D sub { > - my ($pid, $pstart) =3D @_; > + my ($pid, $pstart, $timeout) =3D @_; > + > + $timeout //=3D 5; > =20 > # send kill to process group (negative pid) > my $kpid =3D -$pid; > @@ -374,8 +382,7 @@ my $kill_process_group =3D sub { > # always send signal to all pgrp members > kill(15, $kpid); # send TERM signal > =20 > - # give max 5 seconds to shut down > - for (my $i =3D 0; $i < 5; $i++) { > + for (my $i =3D 0; $i < $timeout; $i++) { > return if !PVE::ProcFSTools::check_process_running($pid, $pstart); > sleep (1); > } > @@ -394,7 +401,8 @@ sub check_worker { > return 0 if !$running; > =20 > if ($killit) { > - &$kill_process_group($task->{pid}); > + my $type =3D $task->{type}; > + &$kill_process_group($task->{pid}, undef, $timeout_map->{$type}); > return 0; > } > =20 >=20