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 2567A82C9A for ; Wed, 1 Dec 2021 09:45:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0A1858A02 for ; Wed, 1 Dec 2021 09:45:15 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 DB40F898A for ; Wed, 1 Dec 2021 09:45:13 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D3D4D44169 for ; Wed, 1 Dec 2021 09:45:08 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 1 Dec 2021 09:45:07 +0100 Message-Id: <20211201084507.1510270-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211201084507.1510270-1-d.csapak@proxmox.com> References: <20211201084507.1510270-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.182 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches 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, inventory.rs, jobstate.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/1] adapt compute_next_event to new signature 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: Wed, 01 Dec 2021 08:45:45 -0000 the 'utc' flag is now contained in the event itself and not given as a flag to 'compute_next_event' anymore Signed-off-by: Dominik Csapak --- src/bin/proxmox-backup-proxy.rs | 4 ++-- src/server/jobstate.rs | 2 +- src/tape/inventory.rs | 2 +- src/tape/media_pool.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 16ae67bb..07a53687 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -585,7 +585,7 @@ async fn schedule_datastore_garbage_collection() { } }; - let next = match event.compute_next_event(last, false) { + let next = match event.compute_next_event(last) { Ok(Some(next)) => next, Ok(None) => continue, Err(err) => { @@ -1040,7 +1040,7 @@ fn check_schedule(worker_type: &str, event_str: &str, id: &str) -> bool { } }; - let next = match event.compute_next_event(last, false) { + let next = match event.compute_next_event(last) { Ok(Some(next)) => next, Ok(None) => return false, Err(err) => { diff --git a/src/server/jobstate.rs b/src/server/jobstate.rs index f874725a..25fb2f9b 100644 --- a/src/server/jobstate.rs +++ b/src/server/jobstate.rs @@ -341,7 +341,7 @@ pub fn compute_schedule_status( if let Some(schedule) = schedule { if let Ok(event) = schedule.parse::() { // ignore errors - status.next_run = event.compute_next_event(last, false).unwrap_or(None); + status.next_run = event.compute_next_event(last).unwrap_or(None); } } diff --git a/src/tape/inventory.rs b/src/tape/inventory.rs index 1f0b41f8..c76e50cd 100644 --- a/src/tape/inventory.rs +++ b/src/tape/inventory.rs @@ -533,7 +533,7 @@ impl Inventory { set_start_time } MediaSetPolicy::CreateAt(ref event) => { - match event.compute_next_event(set_start_time, false) { + match event.compute_next_event(set_start_time) { Ok(Some(next)) => next, Ok(None) | Err(_) => return i64::MAX, } diff --git a/src/tape/media_pool.rs b/src/tape/media_pool.rs index 70713cc3..6a947b22 100644 --- a/src/tape/media_pool.rs +++ b/src/tape/media_pool.rs @@ -290,7 +290,7 @@ impl MediaPool { } MediaSetPolicy::CreateAt(event) => { if let Some(set_start_time) = self.inventory.media_set_start_time(&self.current_media_set.uuid()) { - if let Ok(Some(alloc_time)) = event.compute_next_event(set_start_time as i64, false) { + if let Ok(Some(alloc_time)) = event.compute_next_event(set_start_time as i64) { if current_time >= alloc_time { create_new_set = Some(String::from("policy CreateAt event triggered")); } -- 2.30.2