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 12A3263055 for ; Mon, 24 Jan 2022 13:32:15 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0DD6621AEB for ; Mon, 24 Jan 2022 13:32: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 6A32421ADE for ; Mon, 24 Jan 2022 13:32: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 43CFA4615A for ; Mon, 24 Jan 2022 13:32:14 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Mon, 24 Jan 2022 13:31:56 +0100 Message-Id: <20220124123159.27086-6-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124123159.27086-1-h.laimer@proxmox.com> References: <20220124123159.27086-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 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. [datastore.rs, task.pid] Subject: [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, 24 Jan 2022 12:32:15 -0000 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 { + 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())?; + + 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)?; + 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() -- 2.30.2