proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-07-27 10:47:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: parallelize smartctl checks

Browse Source 
To improve the performance of the smartctl checks, especially when a lot
of disks are used, parallelize the checks using the `ParallelHandler`.

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
This commit is contained in:
Gabriel Goller 2024-09-17 10:05:50 +02:00 committed by Thomas Lamprecht
parent b3d9b6d5f1
commit 1a0229b881
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/tools/disks/mod.rs
View File

@ -15,13 +15,15 @@ use once_cell::sync::OnceCell;
use ::serde::{Deserialize, Serialize}; use ::serde::{Deserialize, Serialize};
use proxmox_lang::{io_bail, io_format_err}; use proxmox_lang::{io_bail, io_format_err};
use proxmox_log::info;
use proxmox_schema::api; use proxmox_schema::api;
use proxmox_sys::linux::procfs::{mountinfo::Device, MountInfo}; use proxmox_sys::linux::procfs::{mountinfo::Device, MountInfo};
use pbs_api_types::{BLOCKDEVICE_DISK_AND_PARTITION_NAME_REGEX, BLOCKDEVICE_NAME_REGEX}; use pbs_api_types::{BLOCKDEVICE_DISK_AND_PARTITION_NAME_REGEX, BLOCKDEVICE_NAME_REGEX};
use crate::tools::parallel_handler::ParallelHandler;
mod zfs; mod zfs;
use tracing::info;
pub use zfs::*; pub use zfs::*;
mod zpool_status; mod zpool_status;
pub use zpool_status::*; pub use zpool_status::*;
@ -1049,16 +1051,6 @@ fn get_disks(
usage = DiskUsageType::DeviceMapper; usage = DiskUsageType::DeviceMapper;
} }
let mut status = SmartStatus::Unknown;
let mut wearout = None;
if !no_smart {
if let Ok(smart) = get_smart_data(&disk, false) {
status = smart.status;
wearout = smart.wearout;
}
}
let info = DiskUsageInfo { let info = DiskUsageInfo {
name: name.clone(), name: name.clone(),
vendor, vendor,
@ -1069,8 +1061,8 @@ fn get_disks(
size, size,
wwn, wwn,
disk_type, disk_type,
status, status: SmartStatus::Unknown,
wearout, wearout: None,
used: usage, used: usage,
gpt: disk.has_gpt(), gpt: disk.has_gpt(),
rpm: disk.ata_rotation_rate_rpm(), rpm: disk.ata_rotation_rate_rpm(),
@ -1079,6 +1071,30 @@ fn get_disks(
result.insert(name, info); result.insert(name, info);
} }
if !no_smart {
let (tx, rx) = crossbeam_channel::bounded(result.len());
let parallel_handler =
ParallelHandler::new("smartctl data", 4, move |device: (String, String)| {
let smart_data = get_smart_data(Path::new(&device.1), false)?;
tx.send((device.0, smart_data))?;
Ok(())
});
for (name, path) in device_paths.into_iter() {
if let Some(p) = path {
parallel_handler.send((name, p))?;
}
}
parallel_handler.complete()?;
while let Ok(msg) = rx.recv() {
if let Some(value) = result.get_mut(&msg.0) {
value.wearout = msg.1.wearout;
value.status = msg.1.status;
}
}
}
Ok(result) Ok(result)
} }