From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8D2F86A161 for ; Tue, 11 Aug 2020 11:58:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 82A0C1BDC6 for ; Tue, 11 Aug 2020 11:57:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B8FA41BC8E for ; Tue, 11 Aug 2020 11:57:26 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 88A5544595 for ; Tue, 11 Aug 2020 11:57:26 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 11 Aug 2020 11:57:22 +0200 Message-Id: <20200811095724.26896-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200811095724.26896-1-d.csapak@proxmox.com> References: <20200811095724.26896-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.045 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [sync.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 7/9] api2/admin/sync: use JobState for faster access to state info X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2020 09:58:04 -0000 and delete the statefile again on syncjob removal Signed-off-by: Dominik Csapak --- changes from v1: * use JobState enum matching src/api2/admin/sync.rs | 47 +++++++++++++++++------------------------ src/api2/config/sync.rs | 2 ++ 2 files changed, 21 insertions(+), 28 deletions(-) diff --git a/src/api2/admin/sync.rs b/src/api2/admin/sync.rs index 19baaa0f..1cab6c78 100644 --- a/src/api2/admin/sync.rs +++ b/src/api2/admin/sync.rs @@ -1,5 +1,3 @@ -use std::collections::HashMap; - use anyhow::{Error}; use serde_json::Value; @@ -10,7 +8,8 @@ use proxmox::{list_subdirs_api_method, sortable}; use crate::api2::types::*; use crate::api2::pull::do_sync_job; use crate::config::sync::{self, SyncJobStatus, SyncJobConfig}; -use crate::server::{self, TaskListInfo}; +use crate::config::jobstate::JobState; +use crate::server::UPID; use crate::tools::systemd::time::{ parse_calendar_event, compute_next_event}; @@ -34,33 +33,25 @@ pub fn list_sync_jobs( let mut list: Vec = config.convert_to_typed_array("sync")?; - let mut last_tasks: HashMap = 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; }, + for job in &mut list { + let last_state = JobState::try_read_or_create("syncjob", &job.id)?; + let (upid, endtime, state, starttime) = match last_state { + JobState::Created { time } => (None, None, None, time), + JobState::Started { upid } => { + let parsed_upid: UPID = upid.parse()?; + (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) + }, }; - 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 { - let mut last = 0; - if let Some(task) = last_tasks.get(&job.id) { - job.last_run_upid = Some(task.upid_str.clone()); - if let Some((endtime, status)) = &task.state { - job.last_run_state = Some(status.to_string()); - job.last_run_endtime = Some(*endtime); - last = *endtime; - } - } + 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 { let schedule = job.schedule.as_ref()?; diff --git a/src/api2/config/sync.rs b/src/api2/config/sync.rs index 8273a4b4..8b16192c 100644 --- a/src/api2/config/sync.rs +++ b/src/api2/config/sync.rs @@ -264,6 +264,8 @@ pub fn delete_sync_job(id: String, digest: Option) -> Result<(), Error> sync::save_config(&config)?; + crate::config::jobstate::remove_state_file("syncjob", &id)?; + Ok(()) } -- 2.20.1