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 2E66F687EC for ; Thu, 14 Jan 2021 16:40:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 198EC1D7B9 for ; Thu, 14 Jan 2021 16:39:37 +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 965BE1D7B1 for ; Thu, 14 Jan 2021 16:39:36 +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 6444445F95 for ; Thu, 14 Jan 2021 16:39:36 +0100 (CET) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Thu, 14 Jan 2021 16:39:21 +0100 Message-Id: <20210114153921.16739-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.039 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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: [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: Thu, 14 Jan 2021 15:40:07 -0000 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 by SIGKILL, not removing the backup lock in the process. 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. Signed-off-by: Stefan Reiter --- src/PVE/RESTEnvironment.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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; } +my $timeout_map = { + # backup cancellation on slow target storages might take a while, avoid + # leaving the VM in locked state + "vzdump" => 60, +}; + my $kill_process_group = sub { - my ($pid, $pstart) = @_; + my ($pid, $pstart, $timeout) = @_; + + $timeout //= 5; # send kill to process group (negative pid) my $kpid = -$pid; @@ -374,8 +382,7 @@ my $kill_process_group = sub { # always send signal to all pgrp members kill(15, $kpid); # send TERM signal - # give max 5 seconds to shut down - for (my $i = 0; $i < 5; $i++) { + for (my $i = 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; if ($killit) { - &$kill_process_group($task->{pid}); + my $type = $task->{type}; + &$kill_process_group($task->{pid}, undef, $timeout_map->{$type}); return 0; } -- 2.20.1