From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 41D0D1FF183 for ; Wed, 17 Dec 2025 10:51:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE09F24023; Wed, 17 Dec 2025 10:51:55 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 17 Dec 2025 10:51:13 +0100 Message-ID: <20251217095113.210083-3-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251217095113.210083-1-c.ebner@proxmox.com> References: <20251217095113.210083-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1765965073052 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.046 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 0.001 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 0.001 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 0.001 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup 2/2] api: config: fix push sync jobs cleanup on datastore destroy 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Since list_config_sync_jobs() defaults to sync direction pull if no explicit direction is provided, push sync jobs are not cleaned up on datastore destruction. The default was set to pull direction intentionally in commit 403ad1f6 ("api: admin: sync: add optional 'all' sync type for listing") to avoid possible issues with clients reading and updating sync job configs via the API. It was then however incorrectly adapted with commit 4b76b731 ("api: admin/config: introduce sync direction as job config parameter"). Fix this by explicitley setting the sync direction to `ListSyncDirection::All` when listing sync jobs for removal. Fixes: 4b76b731 ("api: admin/config: introduce sync direction as job config parameter") Signed-off-by: Christian Ebner --- src/api2/config/datastore.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index d9005694d..f845fe2d0 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -24,7 +24,7 @@ use pbs_datastore::chunk_store::ChunkStore; use crate::api2::admin::datastore::do_mount_device; use crate::api2::admin::prune::list_prune_jobs; -use crate::api2::admin::sync::list_config_sync_jobs; +use crate::api2::admin::sync::{list_config_sync_jobs, ListSyncDirection}; use crate::api2::admin::verify::list_verification_jobs; use crate::api2::config::prune::{delete_prune_job, do_create_prune_job, has_prune_job}; use crate::api2::config::sync::delete_sync_job; @@ -724,7 +724,12 @@ pub async fn delete_datastore( for job in list_verification_jobs(Some(name.clone()), Value::Null, rpcenv)? { delete_verification_job(job.config.id, None, rpcenv)? } - for job in list_config_sync_jobs(Some(name.clone()), None, Value::Null, rpcenv)? { + for job in list_config_sync_jobs( + Some(name.clone()), + Some(ListSyncDirection::All), + Value::Null, + rpcenv, + )? { delete_sync_job(job.config.id, None, rpcenv)? } for job in list_prune_jobs(Some(name.clone()), Value::Null, rpcenv)? { -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel