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 A1DAA677E2 for ; Fri, 31 Jul 2020 14:44:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 975CE1D9C5 for ; Fri, 31 Jul 2020 14:43:38 +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 93E021D948 for ; Fri, 31 Jul 2020 14:43:32 +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 56FD443444 for ; Fri, 31 Jul 2020 14:43:32 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 31 Jul 2020 14:43:29 +0200 Message-Id: <20200731124330.30576-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200731124330.30576-1-d.csapak@proxmox.com> References: <20200731124330.30576-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.049 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 7/8] 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: Fri, 31 Jul 2020 12:44:08 -0000 and delete the statefile again on syncjob removal Signed-off-by: Dominik Csapak --- src/api2/admin/sync.rs | 39 ++++++++++----------------------------- src/api2/config/sync.rs | 2 ++ 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/src/api2/admin/sync.rs b/src/api2/admin/sync.rs index e81a7e9f..d432489d 100644 --- a/src/api2/admin/sync.rs +++ b/src/api2/admin/sync.rs @@ -1,15 +1,14 @@ use anyhow::{Error}; use serde_json::Value; -use std::collections::HashMap; use proxmox::api::{api, ApiMethod, Router, RpcEnvironment}; use proxmox::api::router::SubdirMap; use proxmox::{list_subdirs_api_method, sortable}; use crate::api2::types::*; -use crate::api2::pull::{get_pull_parameters}; +use crate::api2::pull::do_sync_job; use crate::config::sync::{self, SyncJobStatus, SyncJobConfig}; -use crate::server::{self, TaskListInfo, WorkerTask}; +use crate::config::jobstate::JobState; use crate::tools::systemd::time::{ parse_calendar_event, compute_next_event}; @@ -33,33 +32,15 @@ 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; }, - }; - 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(String::from(status)); - job.last_run_endtime = Some(*endtime); - last = *endtime; - } - } + let last_state = JobState::try_read_or_create("syncjob", &job.id)?; + + job.last_run_upid = last_state.upid; + job.last_run_state = last_state.state; + job.last_run_endtime = last_state.endtime; + + let starttime = last_state.starttime; + 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 860dcc36..ed1ccdad 100644 --- a/src/api2/config/sync.rs +++ b/src/api2/config/sync.rs @@ -263,6 +263,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