From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] api2: add keep-job-configs flag to datastore remove endpoint
Date: Thu, 8 Jul 2021 12:13:48 +0200 [thread overview]
Message-ID: <20210708101349.2693257-1-d.csapak@proxmox.com> (raw)
From: Hannes Laimer <h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
Suggested Fixes:
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from Hannes' v1:
* rebased on master
* i fixed the wrong function call (config vs admin)
* changed 'keep_job_configs' to a bool (from an option) since it has a default
src/api2/config/datastore.rs | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index d083d0c4..1fde362a 100644
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -10,6 +10,12 @@ use proxmox::api::schema::parse_property_string;
use pbs_datastore::task::TaskState;
+use crate::api2::config::sync::delete_sync_job;
+use crate::api2::config::verify::delete_verification_job;
+use crate::api2::admin::{
+ sync::list_sync_jobs,
+ verify::list_verification_jobs,
+};
use crate::api2::types::*;
use crate::backup::*;
use crate::config::cached_user_info::CachedUserInfo;
@@ -413,6 +419,12 @@ pub fn update_datastore(
name: {
schema: DATASTORE_SCHEMA,
},
+ "keep-job-configs": {
+ description: "If enabled, the job configurations related to this datastore will be kept.",
+ type: bool,
+ optional: true,
+ default: false,
+ },
digest: {
optional: true,
schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
@@ -424,7 +436,12 @@ pub fn update_datastore(
},
)]
/// Remove a datastore configuration.
-pub async fn delete_datastore(name: String, digest: Option<String>) -> Result<(), Error> {
+pub async fn delete_datastore(
+ name: String,
+ keep_job_configs: bool,
+ digest: Option<String>,
+ rpcenv: &mut dyn RpcEnvironment,
+) -> Result<(), Error> {
let _lock = datastore::lock_config()?;
@@ -440,6 +457,15 @@ pub async fn delete_datastore(name: String, digest: Option<String>) -> Result<()
None => bail!("datastore '{}' does not exist.", name),
}
+ if !keep_job_configs {
+ for job in list_verification_jobs(Some(name.clone()), Value::Null, rpcenv)? {
+ delete_verification_job(job.config.id, None, rpcenv)?
+ }
+ for job in list_sync_jobs(Some(name.clone()), Value::Null, rpcenv)? {
+ delete_sync_job(job.config.id, None, rpcenv)?
+ }
+ }
+
datastore::save_config(&config)?;
// ignore errors
--
2.30.2
next reply other threads:[~2021-07-08 10:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 10:13 Dominik Csapak [this message]
2021-07-08 10:13 ` [pbs-devel] [PATCH proxmox-backup 2/2] api2/config/datastore: delete_datastore: also remove tape backup jobs Dominik Csapak
2021-07-08 10:16 ` [pbs-devel] applied: " Thomas Lamprecht
2021-07-08 10:16 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] api2: add keep-job-configs flag to datastore remove endpoint 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=20210708101349.2693257-1-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