From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] applied: [PATCH proxmox-backup v2 1/2] pbs-config: add 'create_mocked_lock' helper
Date: Tue, 7 Sep 2021 09:05:18 +0200 [thread overview]
Message-ID: <20210907070518.xcbhgbzyelbiooyw@olga.proxmox.com> (raw)
In-Reply-To: <20210906150026.1551456-1-d.csapak@proxmox.com>
applied both patches
On Mon, Sep 06, 2021 at 05:00:25PM +0200, Dominik Csapak wrote:
> by making the field an option and making it None in the mocked case
> this function is only intended for testing and hidden from the docs
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> changes from v1:
> * mark function unsafe, so that it is even more clear that this is not
> intended for 'normal' code
> pbs-config/src/lib.rs | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/pbs-config/src/lib.rs b/pbs-config/src/lib.rs
> index 29811164..bd5430a3 100644
> --- a/pbs-config/src/lib.rs
> +++ b/pbs-config/src/lib.rs
> @@ -18,7 +18,13 @@ pub fn backup_group() -> Result<nix::unistd::Group, Error> {
> pbs_tools::sys::query_group(BACKUP_GROUP_NAME)?
> .ok_or_else(|| format_err!("Unable to lookup '{}' group.", BACKUP_GROUP_NAME))
> }
> -pub struct BackupLockGuard(std::fs::File);
> +pub struct BackupLockGuard(Option<std::fs::File>);
> +
> +#[doc(hidden)]
> +/// Note: do not use for production code, this is only intended for tests
> +pub unsafe fn create_mocked_lock() -> BackupLockGuard {
> + BackupLockGuard(None)
> +}
>
> /// Open or create a lock file owned by user "backup" and lock it.
> ///
> @@ -41,7 +47,7 @@ pub fn open_backup_lockfile<P: AsRef<std::path::Path>>(
> let timeout = timeout.unwrap_or(std::time::Duration::new(10, 0));
>
> let file = proxmox::tools::fs::open_file_locked(&path, timeout, exclusive, options)?;
> - Ok(BackupLockGuard(file))
> + Ok(BackupLockGuard(Some(file)))
> }
>
> /// Atomically write data to file owned by "root:backup" with permission "0640"
> --
> 2.30.2
next prev parent reply other threads:[~2021-09-07 7:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-06 15:00 [pbs-devel] " Dominik Csapak
2021-09-06 15:00 ` [pbs-devel] [PATCH proxmox-backup v2 2/2] tape/inventory: fix the tape tests as user, by mocking the lock Dominik Csapak
2021-09-07 7:05 ` Wolfgang Bumiller [this message]
2021-09-07 7:49 [pbs-devel] applied: [PATCH proxmox-backup v2 1/2] pbs-config: add 'create_mocked_lock' helper Dietmar Maurer
2021-09-07 8:01 ` Dominik Csapak
2021-09-07 8:03 Dietmar Maurer
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=20210907070518.xcbhgbzyelbiooyw@olga.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=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