From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [RFC PATCH proxmox-backup 1/2] pbs-config: use trait object for the backup lock guard
Date: Mon, 6 Sep 2021 12:25:28 +0200 [thread overview]
Message-ID: <20210906102528.3bp6fotg4zoaqazb@olga.proxmox.com> (raw)
In-Reply-To: <20210903071752.1225271-1-d.csapak@proxmox.com>
On Fri, Sep 03, 2021 at 09:17:51AM +0200, Dominik Csapak wrote:
> instead of a fixed type. The old implementation is now
> BackupLockGuardImpl and implements the trait.
>
> At the same time, introduce a type alias with the same name as the
> previous struct, so that the users of it do not have to change anything.
>
> This makes it possible for us to have a different lock implementation
> for e.g. tests (where we do not actually want to lock)
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> pbs-config/src/lib.rs | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/pbs-config/src/lib.rs b/pbs-config/src/lib.rs
> index 9d8c730d..604fe9d7 100644
> --- a/pbs-config/src/lib.rs
> +++ b/pbs-config/src/lib.rs
> @@ -16,7 +16,14 @@ 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 trait BackupLockGuardTrait: Send + Sync + Unpin + std::panic::UnwindSafe + std::panic::RefUnwindSafe { }
> +
> +struct BackupLockGuardImpl(std::fs::File);
> +
> +impl BackupLockGuardTrait for BackupLockGuardImpl {}
> +
> +pub type BackupLockGuard = Box<dyn BackupLockGuardTrait>;
Since the File is abstracted away in a custom type, 2 more possibilities
come to mind:
pub struct BackupLockGuard(Option<File>);
and cfg(test) would just use `None`
or turn the File into our `Fd` type from the proxmox crate and use
`Fd::from_raw_fd(-1)` when no lock is used
That way we don't even need the trait
next prev parent reply other threads:[~2021-09-06 10:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 7:17 Dominik Csapak
2021-09-03 7:17 ` [pbs-devel] [RFC PATCH proxmox-backup 2/2] tape/inventory: fix the tape tests as user by mocking the lock Dominik Csapak
2021-09-06 10:25 ` Wolfgang Bumiller [this message]
2021-09-06 10:41 ` [pbs-devel] [RFC PATCH proxmox-backup 1/2] pbs-config: use trait object for the backup lock guard Dominik Csapak
2021-09-06 10:47 ` 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=20210906102528.3bp6fotg4zoaqazb@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