tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

api2/admin/sync: use JobState for faster access to state info

Browse Source 
and delete the statefile again on syncjob removal

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-08-13 10:29:16 +02:00 committed by Dietmar Maurer
parent e6263c2662
commit 664d8a2765
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/api2/admin/sync.rs
View File

@ -1,6 +1,4 @@
use std::collections::HashMap; use anyhow::{format_err, Error};
use anyhow::{Error};
use serde_json::Value; use serde_json::Value;
use proxmox::api::{api, ApiMethod, Router, RpcEnvironment}; use proxmox::api::{api, ApiMethod, Router, RpcEnvironment};
@ -10,7 +8,8 @@ use proxmox::{list_subdirs_api_method, sortable};
use crate::api2::types::*; use crate::api2::types::*;
use crate::api2::pull::{get_pull_parameters}; use crate::api2::pull::{get_pull_parameters};
use crate::config::sync::{self, SyncJobStatus, SyncJobConfig}; use crate::config::sync::{self, SyncJobStatus, SyncJobConfig};
use crate::server::{self, TaskListInfo, WorkerTask}; use crate::server::UPID;
use crate::config::jobstate::JobState;
use crate::tools::systemd::time::{ use crate::tools::systemd::time::{
parse_calendar_event, compute_next_event}; parse_calendar_event, compute_next_event};
@ -34,33 +33,26 @@ pub fn list_sync_jobs(
let mut list: Vec<SyncJobStatus> = config.convert_to_typed_array("sync")?; let mut list: Vec<SyncJobStatus> = config.convert_to_typed_array("sync")?;
let mut last_tasks: HashMap<String, &TaskListInfo> = HashMap::new();
let tasks = server::read_task_list()?;
for info in tasks.iter() {
let worker_id = match &info.upid.worker_id {
Some(id) => id,
_ => { continue; },
};
if let Some(last) = last_tasks.get(worker_id) {
if last.upid.starttime < info.upid.starttime {
last_tasks.insert(worker_id.to_string(), &info);
}
} else {
last_tasks.insert(worker_id.to_string(), &info);
}
}
for job in &mut list { for job in &mut list {
let mut last = 0; let last_state = JobState::load("syncjob", &job.id)
if let Some(task) = last_tasks.get(&job.id) { .map_err(|err| format_err!("could not open statefile for {}: {}", &job.id, err))?;
job.last_run_upid = Some(task.upid_str.clone()); let (upid, endtime, state, starttime) = match last_state {
if let Some((endtime, status)) = &task.state { JobState::Created { time } => (None, None, None, time),
job.last_run_state = Some(status.to_string()); JobState::Started { upid } => {
job.last_run_endtime = Some(*endtime); let parsed_upid: UPID = upid.parse()?;
last = *endtime; (Some(upid), None, None, parsed_upid.starttime)
} },
} JobState::Finished { upid, endtime, state } => {
let parsed_upid: UPID = upid.parse()?;
(Some(upid), Some(endtime), Some(state.to_string()), parsed_upid.starttime)
},
};
job.last_run_upid = upid;
job.last_run_state = state;
job.last_run_endtime = endtime;
let last = job.last_run_endtime.unwrap_or_else(|| starttime);
job.next_run = (|| -> Option<i64> { job.next_run = (|| -> Option<i64> {
let schedule = job.schedule.as_ref()?; let schedule = job.schedule.as_ref()?;

2
src/api2/config/sync.rs
View File

@ -264,6 +264,8 @@ pub fn delete_sync_job(id: String, digest: Option<String>) -> Result<(), Error>
sync::save_config(&config)?; sync::save_config(&config)?;
crate::config::jobstate::remove_state_file("syncjob", &id)?;
Ok(()) Ok(())
} }