From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 02/11] pbs-datastore/prune: make PruneOptions an api type
Date: Fri, 16 Jul 2021 10:53:19 +0200 [thread overview]
Message-ID: <20210716085328.3731574-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210716085328.3731574-1-d.csapak@proxmox.com>
so that we can reuse it from here
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
pbs-datastore/src/prune.rs | 50 +++++++++++++++++++++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)
diff --git a/pbs-datastore/src/prune.rs b/pbs-datastore/src/prune.rs
index d0d8ca16..4605e26f 100644
--- a/pbs-datastore/src/prune.rs
+++ b/pbs-datastore/src/prune.rs
@@ -2,6 +2,18 @@ use std::collections::{HashMap, HashSet};
use std::path::PathBuf;
use anyhow::{Error};
+use serde::{Deserialize, Serialize};
+
+use proxmox::api::api;
+
+use pbs_api_types::{
+ PRUNE_SCHEMA_KEEP_LAST,
+ PRUNE_SCHEMA_KEEP_HOURLY,
+ PRUNE_SCHEMA_KEEP_DAILY,
+ PRUNE_SCHEMA_KEEP_WEEKLY,
+ PRUNE_SCHEMA_KEEP_MONTHLY,
+ PRUNE_SCHEMA_KEEP_YEARLY,
+};
use super::BackupInfo;
@@ -68,13 +80,49 @@ fn remove_incomplete_snapshots(
}
}
-#[derive(Default)]
+#[api(
+ properties: {
+ "keep-last": {
+ schema: PRUNE_SCHEMA_KEEP_LAST,
+ optional: true,
+ },
+ "keep-hourly": {
+ schema: PRUNE_SCHEMA_KEEP_HOURLY,
+ optional: true,
+ },
+ "keep-daily": {
+ schema: PRUNE_SCHEMA_KEEP_DAILY,
+ optional: true,
+ },
+ "keep-weekly": {
+ schema: PRUNE_SCHEMA_KEEP_WEEKLY,
+ optional: true,
+ },
+ "keep-monthly": {
+ schema: PRUNE_SCHEMA_KEEP_MONTHLY,
+ optional: true,
+ },
+ "keep-yearly": {
+ schema: PRUNE_SCHEMA_KEEP_YEARLY,
+ optional: true,
+ },
+ }
+)]
+#[derive(Serialize, Deserialize, Default)]
+#[serde(rename_all = "kebab-case")]
+/// Common pruning options
pub struct PruneOptions {
+ #[serde(skip_serializing_if="Option::is_none")]
pub keep_last: Option<u64>,
+ #[serde(skip_serializing_if="Option::is_none")]
pub keep_hourly: Option<u64>,
+ #[serde(skip_serializing_if="Option::is_none")]
pub keep_daily: Option<u64>,
+ #[serde(skip_serializing_if="Option::is_none")]
pub keep_weekly: Option<u64>,
+ #[serde(skip_serializing_if="Option::is_none")]
pub keep_monthly: Option<u64>,
+ #[serde(skip_serializing_if="Option::is_none")]
pub keep_yearly: Option<u64>,
}
--
2.30.2
next prev parent reply other threads:[~2021-07-16 8:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-16 8:53 [pbs-devel] [PATCH proxmox-backup 00/11] add 'prune all' button to datastore content Dominik Csapak
2021-07-16 8:53 ` [pbs-devel] [PATCH proxmox-backup 01/11] api-types: move PRUNE_SCHEMA_KEEP_* to pbs-api-types Dominik Csapak
2021-07-16 8:53 ` Dominik Csapak [this message]
2021-07-16 8:53 ` [pbs-devel] [PATCH proxmox-backup 03/11] client: simplify prune api method Dominik Csapak
2021-07-16 8:53 ` [pbs-devel] [PATCH proxmox-backup 04/11] api: admin/datastore: simplify prune api call Dominik Csapak
2021-07-16 8:53 ` [pbs-devel] [PATCH proxmox-backup 05/11] backup/datastore: refactor check_backup_owner there Dominik Csapak
2021-07-16 8:53 ` [pbs-devel] [PATCH proxmox-backup 06/11] server/prune_job: factor out 'prune_datastore' Dominik Csapak
2021-07-16 8:53 ` [pbs-devel] [PATCH proxmox-backup 07/11] server/prune_job: add 'keep_all' logic to 'prune_datastore' Dominik Csapak
2021-07-16 8:53 ` [pbs-devel] [PATCH proxmox-backup 08/11] server/prune_job: add proper permission checks " Dominik Csapak
2021-07-16 8:53 ` [pbs-devel] [PATCH proxmox-backup 09/11] api: admin/datastore: add new 'prune-datastore' api call Dominik Csapak
2021-07-16 8:53 ` [pbs-devel] [PATCH proxmox-backup 10/11] ui: datastore/Content: add 'Prune All' button Dominik Csapak
2021-07-16 8:53 ` [pbs-devel] [PATCH proxmox-backup 11/11] ui: datastore/Prune: improve title of group prune window Dominik Csapak
2021-07-16 9:48 ` [pbs-devel] applied: [PATCH proxmox-backup 00/11] add 'prune all' button to datastore content 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=20210716085328.3731574-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