public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2 2/5] pbs-datastore: chunk_store: use replace_file in insert_chunk
Date: Fri,  7 Oct 2022 13:54:46 +0200	[thread overview]
Message-ID: <20221007115449.3562604-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20221007115449.3562604-1-d.csapak@proxmox.com>

it does the same as the current code

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 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





  parent reply	other threads:[~2022-10-07 11:55 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-07 11:54 [pbs-devel] [PATCH proxmox-backup v2 0/5] add 'sync-level' to datatore tuning options Dominik Csapak
2022-10-07 11:54 ` [pbs-devel] [PATCH proxmox-backup v2 1/5] docs: add information about chunk order option for datastores Dominik Csapak
2022-10-07 11:54 ` Dominik Csapak [this message]
2022-10-07 11:54 ` [pbs-devel] [PATCH proxmox-backup v2 3/5] datastore: implement sync-level tuning " Dominik Csapak
2022-10-07 11:54 ` [pbs-devel] [PATCH proxmox-backup v2 4/5] docs: add documentation about the 'sync-level' tuning Dominik Csapak
2022-10-10  7:54   ` Matthias Heiserer
2022-10-10 14:38   ` Daniel Tschlatscher
2022-10-07 11:54 ` [pbs-devel] [PATCH proxmox-backup v2 5/5] datastore: make 'filesystem' the default sync-level Dominik Csapak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221007115449.3562604-3-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal