stop executing datastore prune job

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2022-05-30 14:41:34 +02:00
parent d4dd7ac842
commit 6283d7d13a
1 changed files with 2 additions and 53 deletions

View File

@ -47,8 +47,8 @@ use pbs_buildcfg::configdir;
use proxmox_time::CalendarEvent; use proxmox_time::CalendarEvent;
use pbs_api_types::{ use pbs_api_types::{
Authid, DataStoreConfig, Operation, PruneJobConfig, PruneJobOptions, SyncJobConfig, Authid, DataStoreConfig, Operation, PruneJobConfig, SyncJobConfig, TapeBackupJobConfig,
TapeBackupJobConfig, VerificationJobConfig, VerificationJobConfig,
}; };
use proxmox_rest_server::daemon; use proxmox_rest_server::daemon;
@ -557,7 +557,6 @@ async fn run_task_scheduler() {
async fn schedule_tasks() -> Result<(), Error> { async fn schedule_tasks() -> Result<(), Error> {
schedule_datastore_garbage_collection().await; schedule_datastore_garbage_collection().await;
schedule_datastore_prune().await;
schedule_datastore_prune_jobs().await; schedule_datastore_prune_jobs().await;
schedule_datastore_sync_jobs().await; schedule_datastore_sync_jobs().await;
schedule_datastore_verify_jobs().await; schedule_datastore_verify_jobs().await;
@ -668,56 +667,6 @@ async fn schedule_datastore_garbage_collection() {
} }
} }
async fn schedule_datastore_prune() {
let config = match pbs_config::datastore::config() {
Err(err) => {
eprintln!("unable to read datastore config - {}", err);
return;
}
Ok((config, _digest)) => config,
};
for (store, (_, store_config)) in config.sections {
let store_config: DataStoreConfig = match serde_json::from_value(store_config) {
Ok(c) => c,
Err(err) => {
eprintln!("datastore '{}' config from_value failed - {}", store, err);
continue;
}
};
let event_str = match store_config.prune_schedule {
Some(event_str) => event_str,
None => continue,
};
let prune_options = PruneJobOptions {
keep: store_config.keep,
..Default::default()
};
if !prune_options.keeps_something() {
// no prune settings - keep all
continue;
}
let worker_type = "prune";
if check_schedule(worker_type, &event_str, &store) {
let job = match Job::new(worker_type, &store) {
Ok(job) => job,
Err(_) => continue, // could not get lock
};
let auth_id = Authid::root_auth_id().clone();
if let Err(err) =
do_prune_job(job, prune_options, store.clone(), &auth_id, Some(event_str))
{
eprintln!("unable to start datastore prune job {} - {}", &store, err);
}
};
}
}
async fn schedule_datastore_prune_jobs() { async fn schedule_datastore_prune_jobs() {
let config = match pbs_config::prune::config() { let config = match pbs_config::prune::config() {
Err(err) => { Err(err) => {