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 177826501F for ; Mon, 31 Jan 2022 15:47:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1010725D4F for ; Mon, 31 Jan 2022 15:47:45 +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 59DE125D44 for ; Mon, 31 Jan 2022 15:47:44 +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 2D90F46122; Mon, 31 Jan 2022 15:47:44 +0100 (CET) Message-ID: <4a777343-a0bd-7a81-4650-742d0ebaee6f@proxmox.com> Date: Mon, 31 Jan 2022 15:47:42 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:97.0) Gecko/20100101 Thunderbird/97.0 Content-Language: en-US To: Proxmox Backup Server development discussion , Hannes Laimer References: <20220124123159.27086-1-h.laimer@proxmox.com> <20220124123159.27086-6-h.laimer@proxmox.com> From: Dominik Csapak In-Reply-To: <20220124123159.27086-6-h.laimer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.164 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pbs-devel] [PATCH proxmox-backup v5 5/8] api: add get_active_operations endpoint 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: Mon, 31 Jan 2022 14:47:45 -0000 comments inline On 1/24/22 13:31, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > pbs-datastore/src/task_tracking.rs | 30 ++++++++++++++++++++++++++++ > src/api2/admin/datastore.rs | 32 +++++++++++++++++++++++++++++- > 2 files changed, 61 insertions(+), 1 deletion(-) > > diff --git a/pbs-datastore/src/task_tracking.rs b/pbs-datastore/src/task_tracking.rs > index 06266e55..3f9693fa 100644 > --- a/pbs-datastore/src/task_tracking.rs > +++ b/pbs-datastore/src/task_tracking.rs > @@ -14,6 +14,36 @@ struct TaskOperations { > writing_operations: i64, > } > > +pub fn get_active_operations(name: &str, operation: Operation) -> Result { imho it would make sense to get all types of operations back here, that way we can save a call to this function later (and with it the double parsing/locking (more on that below)/etc..) > + let path = PathBuf::from(format!("{}/{}", crate::ACTIVE_OPERATIONS_DIR, name)); > + let lock_path = PathBuf::from(format!("{}/{}.lock", crate::ACTIVE_OPERATIONS_DIR, name)); > + > + let user = pbs_config::backup_user()?; > + let options = CreateOptions::new() > + .group(user.gid) > + .owner(user.uid) > + .perm(nix::sys::stat::Mode::from_bits_truncate(0o660)); > + > + let timeout = std::time::Duration::new(10, 0); > + open_file_locked(&lock_path, timeout, true, options.clone())?; we only read and parse the file here, no updating, so we do not have to lock here (the file is written atomically) that way, the api call does not block a datastore operation > + > + Ok(match file_read_optional_string(&path)? { > + Some(data) => { > + let active_tasks: Vec = serde_json::from_str(&data)?; > + active_tasks.iter() > + .filter(|task| procfs::check_process_running(task.pid as pid_t).is_some()) > + .map(|task| { > + match operation { > + Operation::Read => task.reading_operations, > + Operation::Write => task.writing_operations, > + } > + }) > + .sum() > + } > + None => 0, > + }) > +} > + > pub fn update_active_operations(name: &str, operation: Operation, count: i64) -> Result<(), Error> { > let path = PathBuf::from(format!("{}/{}", crate::ACTIVE_OPERATIONS_DIR, name)); > let lock_path = PathBuf::from(format!("{}/{}.lock", crate::ACTIVE_OPERATIONS_DIR, name)); > diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs > index ce710938..878f21d4 100644 > --- a/src/api2/admin/datastore.rs > +++ b/src/api2/admin/datastore.rs > @@ -43,7 +43,7 @@ use pbs_api_types::{ Authid, BackupContent, Counts, CryptMode, > use pbs_client::pxar::create_zip; > use pbs_datastore::{ > check_backup_owner, DataStore, BackupDir, BackupGroup, StoreProgress, LocalChunkReader, > - CATALOG_NAME, > + CATALOG_NAME, task_tracking > }; > use pbs_datastore::backup_info::BackupInfo; > use pbs_datastore::cached_chunk_reader::CachedChunkReader; > @@ -1590,6 +1590,31 @@ pub fn get_rrd_stats( > ) > } > > +#[api( > + input: { > + properties: { > + store: { > + schema: DATASTORE_SCHEMA, > + }, > + }, > + }, > + access: { > + permission: &Permission::Privilege(&["datastore", "{store}"], PRIV_DATASTORE_AUDIT, true), > + }, > +)] > +/// Read datastore stats > +pub fn get_active_operations( > + store: String, > + _param: Value, > +) -> Result { > + let reading = task_tracking::get_active_operations(&store, Operation::Read)?; > + let writing = task_tracking::get_active_operations(&store, Operation::Write)?; this is what i meant above. when the function returns both operation counters, we only have to call it once here > + Ok(json!({ > + "read": reading, > + "write": writing > + })) > +} > + > #[api( > input: { > properties: { > @@ -1947,6 +1972,11 @@ pub fn set_backup_owner( > > #[sortable] > const DATASTORE_INFO_SUBDIRS: SubdirMap = &[ > + ( > + "active-operations", > + &Router::new() > + .get(&API_METHOD_GET_ACTIVE_OPERATIONS) > + ), > ( > "catalog", > &Router::new()