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 E60678A5B9 for ; Thu, 20 Oct 2022 09:41:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CCA7A411A for ; Thu, 20 Oct 2022 09:41:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Thu, 20 Oct 2022 09:40:59 +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 97BDA44AB4 for ; Thu, 20 Oct 2022 09:40:59 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 20 Oct 2022 09:40:55 +0200 Message-Id: <20221020074058.717152-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221020074058.717152-1-d.csapak@proxmox.com> References: <20221020074058.717152-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.018 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup v3 2/5] pbs-datastore: chunk_store: use replace_file in insert_chunk 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, 20 Oct 2022 07:41:31 -0000 it does the same as the current code Signed-off-by: Dominik Csapak --- pbs-datastore/src/chunk_store.rs | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs index 3bebc645..145d2c7e 100644 --- a/pbs-datastore/src/chunk_store.rs +++ b/pbs-datastore/src/chunk_store.rs @@ -1,4 +1,3 @@ -use std::io::Write; use std::os::unix::io::AsRawFd; use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex}; @@ -461,21 +460,9 @@ impl ChunkStore { } } - let mut tmp_path = chunk_path.clone(); - tmp_path.set_extension("tmp"); - - let mut file = std::fs::File::create(&tmp_path).map_err(|err| { - format_err!("creating chunk on store '{name}' failed for {digest_str} - {err}") - })?; - - file.write_all(raw_data).map_err(|err| { - format_err!("writing chunk on store '{name}' failed for {digest_str} - {err}") - })?; - - if let Err(err) = std::fs::rename(&tmp_path, &chunk_path) { - if std::fs::remove_file(&tmp_path).is_err() { /* ignore */ } - bail!("atomic rename on store '{name}' failed for chunk {digest_str} - {err}"); - } + proxmox_sys::fs::replace_file(chunk_path, raw_data, CreateOptions::new(), false).map_err( + |err| format_err!("inserting chunk on store '{name}' failed for {digest_str} - {err}"), + )?; drop(lock); -- 2.30.2