From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [PATCH proxmox-backup v3 03/13] add protected info of snapshots to api and task logs
Date: Thu, 28 Oct 2021 11:05:39 +0200 [thread overview]
Message-ID: <20211028090539.cprbdfnjgypd3xuq@olga.proxmox.com> (raw)
In-Reply-To: <20211027112238.3758515-4-d.csapak@proxmox.com>
more minor nitpicking
On Wed, Oct 27, 2021 at 01:22:28PM +0200, Dominik Csapak wrote:
> adds the info that a snapshot is protected to:
> * snapshot list
> * manual pruning (also dry-run)
> * prune jobs
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> pbs-api-types/src/datastore.rs | 2 ++
> pbs-datastore/src/prune.rs | 40 +++++++++++++++++++++++++++-------
> src/api2/admin/datastore.rs | 15 ++++++++-----
> src/server/prune_job.rs | 6 ++---
> tests/prune.rs | 4 ++--
> 5 files changed, 49 insertions(+), 18 deletions(-)
>
> diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
> index 462081e4..77c1258f 100644
> --- a/pbs-api-types/src/datastore.rs
> +++ b/pbs-api-types/src/datastore.rs
> @@ -390,6 +390,8 @@ pub struct SnapshotListItem {
> /// The owner of the snapshots group
> #[serde(skip_serializing_if = "Option::is_none")]
> pub owner: Option<Authid>,
> + /// Protection from prunes
> + pub protected: bool,
> }
>
> #[api(
> diff --git a/pbs-datastore/src/prune.rs b/pbs-datastore/src/prune.rs
> index 0eaa8acd..e66ed408 100644
> --- a/pbs-datastore/src/prune.rs
> +++ b/pbs-datastore/src/prune.rs
> @@ -7,7 +7,30 @@ use pbs_api_types::PruneOptions;
>
> use super::BackupInfo;
>
> -enum PruneMark { Protected, Keep, KeepPartial, Remove }
> +#[derive(Clone, Copy, PartialEq, Eq)]
> +pub enum PruneMark { Protected, Keep, KeepPartial, Remove }
> +
> +impl PruneMark {
> + pub fn keep(&self) -> bool {
It's a tiny `Copy` type, you can drop the `&` above and `*` below in
boht methods.
> + *self != PruneMark::Remove
> + }
> +
> + pub fn protected(&self) -> bool {
> + *self == PruneMark::Protected
> + }
> +}
> +
> +impl std::fmt::Display for PruneMark {
> + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
> + let txt = match self {
f.write_str(match self {
> + PruneMark::Protected => "protected",
> + PruneMark::Keep => "keep",
> + PruneMark::KeepPartial => "keep-partial",
> + PruneMark::Remove => "remove",
> + };
})
drop the `write!` usage
> + write!(f, "{}", txt)
> + }
> +}
>
> fn mark_selections<F: Fn(&BackupInfo) -> Result<String, Error>> (
> mark: &mut HashMap<PathBuf, PruneMark>,
> @@ -125,7 +148,7 @@ pub fn cli_options_string(options: &PruneOptions) -> String {
> pub fn compute_prune_info(
> mut list: Vec<BackupInfo>,
> options: &PruneOptions,
> -) -> Result<Vec<(BackupInfo, bool)>, Error> {
> +) -> Result<Vec<(BackupInfo, PruneMark)>, Error> {
>
> let mut mark = HashMap::new();
>
> @@ -173,15 +196,16 @@ pub fn compute_prune_info(
> })?;
> }
>
> - let prune_info: Vec<(BackupInfo, bool)> = list.into_iter()
> + let prune_info: Vec<(BackupInfo, PruneMark)> = list.into_iter()
> .map(|info| {
> let backup_id = info.backup_dir.relative_path();
> - let keep = match mark.get(&backup_id) {
> - Some(PruneMark::Keep) => true,
> - Some(PruneMark::KeepPartial) => true,
> - _ => false,
> + let mark = if info.protected {
> + PruneMark::Protected
> + } else {
> + *mark.get(&backup_id).unwrap_or(&PruneMark::Remove)
(could use `.copied()` instead of `*` and `&`)
> };
> - (info, keep)
> +
> + (info, mark)
> })
> .collect();
>
next prev parent reply other threads:[~2021-10-28 9:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-27 11:22 [pbs-devel] [PATCH proxmox-backup v3 00/13] add 'protected' setting for snapshots Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 01/13] pbs-datastore: add protection info to BackupInfo Dominik Csapak
2021-10-28 9:05 ` Wolfgang Bumiller
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 02/13] pbs-datastore: skip protected backups in pruning Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 03/13] add protected info of snapshots to api and task logs Dominik Csapak
2021-10-28 9:05 ` Wolfgang Bumiller [this message]
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 04/13] tests/prune: add tests for protecteded backups Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 05/13] backup/datastore: prevent protected snapshots to be removed Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 06/13] pull_store/group: dont try remove locally protected snapshots Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 07/13] api2: datastore/delete_group: throw error for partially removed group Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 08/13] api2/admin/datastore: add get/set_protection Dominik Csapak
2021-10-28 9:05 ` Wolfgang Bumiller
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 09/13] proxmox-backup-client: add 'protected' commands Dominik Csapak
2021-10-28 9:05 ` Wolfgang Bumiller
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 10/13] ui: PruneInputPanel: add keepReason 'protected' for protected backups Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 11/13] ui: add protected icon to snapshots Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 12/13] fix #3602: ui: datastore/Content: add action to set protection status Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 13/13] docs: add info about protection flag to client docs Dominik Csapak
2021-10-28 9:33 ` [pbs-devel] applied series: [PATCH proxmox-backup v3 00/13] add 'protected' setting for snapshots Wolfgang Bumiller
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=20211028090539.cprbdfnjgypd3xuq@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