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 B1D606295D for ; Tue, 27 Oct 2020 16:20:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BFEE518C45 for ; Tue, 27 Oct 2020 16:20:18 +0100 (CET) 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 236C018C0F for ; Tue, 27 Oct 2020 16:20:14 +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 E1E5F45C2C for ; Tue, 27 Oct 2020 16:20:13 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 27 Oct 2020 16:20:04 +0100 Message-Id: <20201027152011.7373-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201027152011.7373-1-d.csapak@proxmox.com> References: <20201027152011.7373-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.450 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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_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. [verify.rs, sync.rs, job.store] Subject: [pbs-devel] [PATCH proxmox-backup 1/8] api/{verify, syncjobs}: add optional datastore parameter 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, 27 Oct 2020 15:20:45 -0000 to limit the lists to the given datastores Signed-off-by: Dominik Csapak --- src/api2/admin/sync.rs | 19 +++++++++++++++++-- src/api2/admin/verify.rs | 19 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/api2/admin/sync.rs b/src/api2/admin/sync.rs index bea52a0a..e1072f72 100644 --- a/src/api2/admin/sync.rs +++ b/src/api2/admin/sync.rs @@ -15,7 +15,12 @@ use crate::tools::systemd::time::{ #[api( input: { - properties: {}, + properties: { + store: { + schema: DATASTORE_SCHEMA, + optional: true, + }, + }, }, returns: { description: "List configured jobs and their status.", @@ -25,13 +30,23 @@ use crate::tools::systemd::time::{ )] /// List all sync jobs pub fn list_sync_jobs( + store: Option, _param: Value, mut rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = sync::config()?; - let mut list: Vec = config.convert_to_typed_array("sync")?; + let mut list: Vec = config + .convert_to_typed_array("sync")? + .into_iter() + .filter(|job: &SyncJobStatus| { + if let Some(store) = &store { + &job.store == store + } else { + true + } + }).collect(); for job in &mut list { let last_state = JobState::load("syncjob", &job.id) diff --git a/src/api2/admin/verify.rs b/src/api2/admin/verify.rs index f61373a0..c5d84b43 100644 --- a/src/api2/admin/verify.rs +++ b/src/api2/admin/verify.rs @@ -15,7 +15,12 @@ use crate::server::UPID; #[api( input: { - properties: {}, + properties: { + store: { + schema: DATASTORE_SCHEMA, + optional: true, + }, + }, }, returns: { description: "List configured jobs and their status.", @@ -25,13 +30,23 @@ use crate::server::UPID; )] /// List all verification jobs pub fn list_verification_jobs( + store: Option, _param: Value, mut rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = verify::config()?; - let mut list: Vec = config.convert_to_typed_array("verification")?; + let mut list: Vec = config + .convert_to_typed_array("verification")? + .into_iter() + .filter(|job: &VerificationJobStatus| { + if let Some(store) = &store { + &job.store == store + } else { + true + } + }).collect(); for job in &mut list { let last_state = JobState::load("verificationjob", &job.id) -- 2.20.1