From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id D114C1FF13C for ; Thu, 02 Apr 2026 18:22:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6FE861F388; Thu, 2 Apr 2026 18:23:10 +0200 (CEST) Message-ID: Date: Thu, 2 Apr 2026 18:22:36 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH proxmox-backup v3 1/3] api: move statefile loading into compute_schedule_status To: =?UTF-8?Q?Michael_K=C3=B6ppl?= , pbs-devel@lists.proxmox.com References: <20260325160617.342295-1-m.koeppl@proxmox.com> <20260325160617.342295-2-m.koeppl@proxmox.com> Content-Language: en-US, de-DE From: Christian Ebner In-Reply-To: <20260325160617.342295-2-m.koeppl@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1775146898120 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.432 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 1 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 1 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 1 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: AZW2QFDMTJ3ODMVL4Y4DIGYH2BXTXSXK X-Message-ID-Hash: AZW2QFDMTJ3ODMVL4Y4DIGYH2BXTXSXK X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: One comment inline. On 3/25/26 5:05 PM, Michael Köppl wrote: > Centralize loading of the job statefiles in compute_schedule_status, > reducing code duplication across the job management API endpoints. > > Signed-off-by: Michael Köppl > --- > src/api2/admin/datastore.rs | 15 ++++++--------- > src/api2/admin/prune.rs | 9 +++------ > src/api2/admin/sync.rs | 9 +++------ > src/api2/admin/verify.rs | 9 +++------ > src/api2/tape/backup.rs | 9 +++------ > src/server/jobstate.rs | 8 ++++++-- > 6 files changed, 24 insertions(+), 35 deletions(-) > > diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs > index cca340553..1a04a17ec 100644 > --- a/src/api2/admin/datastore.rs > +++ b/src/api2/admin/datastore.rs > @@ -1167,19 +1167,14 @@ pub fn garbage_collection_status( > > let datastore = DataStore::lookup_datastore(&store, Operation::Read)?; > let status_in_memory = datastore.last_gc_status(); > - let state_file = JobState::load("garbage_collection", &store) > - .map_err(|err| log::error!("could not open GC statefile for {store}: {err}")) > - .ok(); > > let mut last = proxmox_time::epoch_i64(); > > + let jobtype = "garbage_collection"; > + > if let Some(ref upid) = status_in_memory.upid { > - let mut computed_schedule: JobScheduleStatus = JobScheduleStatus::default(); > - if let Some(state) = state_file { > - if let Ok(cs) = compute_schedule_status(&state, Some(upid)) { > - computed_schedule = cs; > - } > - } > + let computed_schedule: JobScheduleStatus = > + compute_schedule_status(jobtype, &store, Some(upid))?; comment: While the change in behavior here when parsing the UPID fails is fine as discussed in the previous patch series [0], this must be mentioned in the commit message! A short comment such as: ``` This also changes the error handling for UPID parsing errors with garbage collection state files, aligning it to the rest of the API handler behavior. ``` Other than that, consider Reviewed-by: Christian Ebner [0] https://lore.proxmox.com/pbs-devel/DH6UARBSGJYA.172KMABDLD4GQ@proxmox.com/