From: Gabriel Goller <g.goller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v2 proxmox-backup 2/2] datastore: store datastore lock on tmpfs
Date: Wed, 6 Dec 2023 14:28:34 +0100 [thread overview]
Message-ID: <20231206132834.240700-3-g.goller@proxmox.com> (raw)
In-Reply-To: <20231206132834.240700-1-g.goller@proxmox.com>
Store the lockfiles that lock the whole datastore (which get created on
startup) on tmpfs in `/run/proxmox-backup/locks`.
This allows datastores to always be unmounted without having to restart.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
pbs-datastore/src/chunk_store.rs | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs
index fb282749..41332db3 100644
--- a/pbs-datastore/src/chunk_store.rs
+++ b/pbs-datastore/src/chunk_store.rs
@@ -18,6 +18,8 @@ use crate::file_formats::{
};
use crate::DataBlob;
+pub const DATASTORE_LOCKS_DIR: &str = "/run/proxmox-backup/locks";
+
/// File system based chunk store
pub struct ChunkStore {
name: String, // used for error reporting
@@ -124,7 +126,7 @@ impl ChunkStore {
}
// create lock file with correct owner/group
- let lockfile_path = Self::lockfile_path(&base);
+ let lockfile_path = Self::lockfile_path(name);
proxmox_sys::fs::replace_file(lockfile_path, b"", options.clone(), false)?;
// create 64*1024 subdirs
@@ -153,8 +155,9 @@ impl ChunkStore {
Self::open(name, base, sync_level)
}
- fn lockfile_path<P: Into<PathBuf>>(base: P) -> PathBuf {
- let mut lockfile_path: PathBuf = base.into();
+ fn lockfile_path(base: &str) -> PathBuf {
+ let mut lockfile_path: PathBuf = DATASTORE_LOCKS_DIR.into();
+ lockfile_path.push(base);
lockfile_path.push(".lock");
lockfile_path
}
@@ -181,7 +184,7 @@ impl ChunkStore {
bail!("unable to open chunk store '{name}' at {chunk_dir:?} - {err}");
}
- let lockfile_path = Self::lockfile_path(&base);
+ let lockfile_path = Self::lockfile_path(name);
let locker = ProcessLocker::new(lockfile_path)?;
--
2.39.2
next prev parent reply other threads:[~2023-12-06 13:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-06 13:28 [pbs-devel] [PATCH v2 proxmox{, -backup} 0/2] Move ProcessLocker to tmpfs Gabriel Goller
2023-12-06 13:28 ` [pbs-devel] [PATCH v2 proxmox 1/2] process_locker: use ofd locking Gabriel Goller
2023-12-06 13:28 ` Gabriel Goller [this message]
2023-12-06 13:41 ` [pbs-devel] [PATCH v2 proxmox{, -backup} 0/2] Move ProcessLocker to tmpfs Fabian Grünbichler
2023-12-06 13:56 ` Gabriel Goller
2023-12-06 14:14 ` Fabian Grünbichler
2023-12-06 14:21 ` Gabriel Goller
2023-12-06 14:33 ` Fabian Grünbichler
2023-12-06 14:36 ` Thomas Lamprecht
2023-12-06 14:46 ` Gabriel Goller
2023-12-06 14:58 ` Thomas Lamprecht
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=20231206132834.240700-3-g.goller@proxmox.com \
--to=g.goller@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.