tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

api: node/disk: rustfmt

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-02-10 13:12:15 +01:00
parent dcf5a0f62d
commit a1c906cb02
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/api2/node/disks/mod.rs
View File

@ -1,21 +1,19 @@
use anyhow::{bail, Error}; use anyhow::{bail, Error};
use serde_json::{json, Value}; use serde_json::{json, Value};
use proxmox_sys::sortable;
use proxmox_router::{ use proxmox_router::{
list_subdirs_api_method, Router, RpcEnvironment, RpcEnvironmentType, SubdirMap, Permission, list_subdirs_api_method, Permission, Router, RpcEnvironment, RpcEnvironmentType, SubdirMap,
}; };
use proxmox_schema::api; use proxmox_schema::api;
use proxmox_sys::task_log; use proxmox_sys::{sortable, task_log};
use pbs_api_types::{ use pbs_api_types::{
UPID_SCHEMA, NODE_SCHEMA, BLOCKDEVICE_NAME_SCHEMA, BLOCKDEVICE_NAME_SCHEMA, NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA,
PRIV_SYS_AUDIT, PRIV_SYS_MODIFY,
}; };
use crate::tools::disks::{ use crate::tools::disks::{
DiskUsageInfo, DiskUsageType, DiskManage, SmartData, get_disk_usage_info, get_disks, get_smart_data, inititialize_gpt_disk, DiskManage,
get_disks, get_smart_data, get_disk_usage_info, inititialize_gpt_disk, DiskUsageInfo, DiskUsageType, SmartData,
}; };
use proxmox_rest_server::WorkerTask; use proxmox_rest_server::WorkerTask;
@ -57,7 +55,6 @@ pub fn list_disks(
skipsmart: bool, skipsmart: bool,
usage_type: Option<DiskUsageType>, usage_type: Option<DiskUsageType>,
) -> Result<Vec<DiskUsageInfo>, Error> { ) -> Result<Vec<DiskUsageInfo>, Error> {
let mut list = Vec::new(); let mut list = Vec::new();
for (_, info) in get_disks(None, skipsmart)? { for (_, info) in get_disks(None, skipsmart)? {
@ -100,11 +97,7 @@ pub fn list_disks(
}, },
)] )]
/// Get SMART attributes and health of a disk. /// Get SMART attributes and health of a disk.
pub fn smart_status( pub fn smart_status(disk: String, healthonly: Option<bool>) -> Result<SmartData, Error> {
disk: String,
healthonly: Option<bool>,
) -> Result<SmartData, Error> {
let healthonly = healthonly.unwrap_or(false); let healthonly = healthonly.unwrap_or(false);
let manager = DiskManage::new(); let manager = DiskManage::new();
@ -143,7 +136,6 @@ pub fn initialize_disk(
uuid: Option<String>, uuid: Option<String>,
rpcenv: &mut dyn RpcEnvironment, rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> { ) -> Result<Value, Error> {
let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let auth_id = rpcenv.get_auth_id().unwrap(); let auth_id = rpcenv.get_auth_id().unwrap();
@ -155,8 +147,11 @@ pub fn initialize_disk(
} }
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
"diskinit", Some(disk.clone()), auth_id, to_stdout, move |worker| "diskinit",
{ Some(disk.clone()),
auth_id,
to_stdout,
move |worker| {
task_log!(worker, "initialize disk {}", disk); task_log!(worker, "initialize disk {}", disk);
let disk_manager = DiskManage::new(); let disk_manager = DiskManage::new();
@ -165,7 +160,8 @@ pub fn initialize_disk(
inititialize_gpt_disk(&disk_info, uuid.as_deref())?; inititialize_gpt_disk(&disk_info, uuid.as_deref())?;
Ok(()) Ok(())
})?; },
)?;
Ok(json!(upid_str)) Ok(json!(upid_str))
} }
@ -175,18 +171,9 @@ const SUBDIRS: SubdirMap = &sorted!([
// ("lvm", &lvm::ROUTER), // ("lvm", &lvm::ROUTER),
("directory", &directory::ROUTER), ("directory", &directory::ROUTER),
("zfs", &zfs::ROUTER), ("zfs", &zfs::ROUTER),
( ("initgpt", &Router::new().post(&API_METHOD_INITIALIZE_DISK)),
"initgpt", &Router::new() ("list", &Router::new().get(&API_METHOD_LIST_DISKS)),
.post(&API_METHOD_INITIALIZE_DISK) ("smart", &Router::new().get(&API_METHOD_SMART_STATUS)),
),
(
"list", &Router::new()
.get(&API_METHOD_LIST_DISKS)
),
(
"smart", &Router::new()
.get(&API_METHOD_SMART_STATUS)
),
]); ]);
pub const ROUTER: Router = Router::new() pub const ROUTER: Router = Router::new()