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 AB24D60684 for ; Thu, 15 Oct 2020 07:39:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A306DED44 for ; Thu, 15 Oct 2020 07:39:53 +0200 (CEST) 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 EE89EED37 for ; Thu, 15 Oct 2020 07:39:52 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B6D7345D58 for ; Thu, 15 Oct 2020 07:39:52 +0200 (CEST) Date: Thu, 15 Oct 2020 07:39:36 +0200 (CEST) From: Dietmar Maurer To: Proxmox Backup Server development discussion , Stefan Reiter Message-ID: <1476804869.109.1602740377063@webmail.proxmox.com> In-Reply-To: <20201014121639.25276-9-s.reiter@proxmox.com> References: <20201014121639.25276-1-s.reiter@proxmox.com> <20201014121639.25276-9-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.4-Rev11 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.066 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. [verify.rs, proxmox.com] Subject: Re: [pbs-devel] [PATCH proxmox-backup 08/11] datastore: add manifest locking X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Oct 2020 05:39:53 -0000 Holding the lock for such long time seems wrong to me. Instead, can we simple reload the manifest before we update the verify_state? > diff --git a/src/backup/verify.rs b/src/backup/verify.rs > index 05b6ba86..839987e1 100644 > --- a/src/backup/verify.rs > +++ b/src/backup/verify.rs > @@ -300,8 +300,8 @@ pub fn verify_backup_dir( > return Ok(true); > } > > - let mut manifest = match datastore.load_manifest(&backup_dir) { > - Ok((manifest, _)) => manifest, > + let (mut manifest, manifest_guard) = match datastore.load_manifest_locked(&backup_dir) { > + Ok((manifest, guard)) => (manifest, guard), > Err(err) => { > task_log!( > worker, > @@ -368,7 +368,7 @@ pub fn verify_backup_dir( > upid, > }; > manifest.unprotected["verify_state"] = serde_json::to_value(verify_state)?; > - datastore.store_manifest(&backup_dir, manifest) > + datastore.store_manifest(&backup_dir, manifest, manifest_guard) > .map_err(|err| format_err!("unable to store manifest blob - {}", err))?; > > Ok(error_count == 0) > -- > 2.20.1 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel