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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CE70869835 for ; Wed, 24 Feb 2021 19:31:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 924AB2CEFE for ; Wed, 24 Feb 2021 19:31:27 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4B5E02CEB6 for ; Wed, 24 Feb 2021 19:31:26 +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 0F65946326 for ; Wed, 24 Feb 2021 19:31:26 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 24 Feb 2021 19:31:02 +0100 Message-Id: <20210224183109.29014-6-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224183109.29014-1-s.ivanov@proxmox.com> References: <20210224183109.29014-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.061 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. [job.pm] Subject: [pmg-devel] [PATCH pmg-api 5/5] backup: pbs: prevent race in concurrent backups X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Feb 2021 18:31:27 -0000 If two pbs backup-creation calls happen simultaenously, it is possible that the first removes the backup dir before the other is done creating or sending it to the pbs remote. non-PBS backups are not affected, since they create the files for tar in a tempdir (indexed by PID and current time). Noticed while having 2 schedules to different PBS instances with the same interval and w/o random delay. Signed-off-by: Stoiko Ivanov --- src/PMG/API2/PBS/Job.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/PMG/API2/PBS/Job.pm b/src/PMG/API2/PBS/Job.pm index 279afbc..e5dcb9c 100644 --- a/src/PMG/API2/PBS/Job.pm +++ b/src/PMG/API2/PBS/Job.pm @@ -303,13 +303,14 @@ __PACKAGE__->register_method ({ my $pbs = PVE::PBSClient->new($remote_config, $remote, $conf->{secret_dir}); my $backup_dir = "/var/lib/pmg/backup/current"; + my $lockfile = "/var/lock/pmg-pbs-backup.lck"; my $worker = sub { my $upid = shift; my $log = "starting update of current backup state\n"; - eval { + my $create_backup = sub { -d $backup_dir || mkdir $backup_dir; PMG::Backup::pmg_backup($backup_dir, $param->{statistic}); @@ -317,6 +318,10 @@ __PACKAGE__->register_method ({ rmtree $backup_dir; }; + + eval { + PVE::Tools::lock_file($lockfile, undef, $create_backup); + }; my $err = $@; $log .= $err if $err; -- 2.20.1