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 71E6C6A0C2 for ; Tue, 11 Aug 2020 11:57:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4C6DB1BCA3 for ; Tue, 11 Aug 2020 11:57:29 +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 76FAE1BC87 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 433B144595 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:21 +0200 Message-Id: <20200811095724.26896-7-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.048 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. [proxmox-backup-proxy.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 6/9] syncjob: use JobState for determining when to run next scheduled sync 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:57:29 -0000 Signed-off-by: Dominik Csapak --- changes from v1: * use JobState enum matching and parse the upid for the starttime src/bin/proxmox-backup-proxy.rs | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 911f1057..b462c2ef 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -474,7 +474,7 @@ async fn schedule_datastore_prune() { async fn schedule_datastore_sync_jobs() { use proxmox_backup::{ - config::{ sync::{self, SyncJobConfig}}, + config::{ sync::{self, SyncJobConfig}, jobstate::JobState }, tools::systemd::time::{ parse_calendar_event, compute_next_event }, }; @@ -510,17 +510,28 @@ async fn schedule_datastore_sync_jobs() { let worker_type = "syncjob"; - let last = match lookup_last_worker(worker_type, &job_id) { - Ok(Some(upid)) => { + let laststate = match JobState::try_read_or_create(worker_type, &job_id) { + Ok(state) => state, + Err(err) => { + eprintln!("could not load last state: {}", err); + continue; + } + }; + + let last = match laststate { + JobState::Created { time } => time, + JobState::Started { upid } | JobState::Finished { upid, .. } => { + let upid: crate::server::UPID = match upid.parse() { + Ok(upid) => upid, + Err(err) => { + eprintln!("could not parse upid from state: {}", err); + continue; + } + }; if proxmox_backup::server::worker_is_active_local(&upid) { continue; } upid.starttime - }, - Ok(None) => 0, - Err(err) => { - eprintln!("lookup_last_job_start failed: {}", err); - continue; } }; -- 2.20.1