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

tape: avoid executor blocking in changer api

This commit is contained in:
Dietmar Maurer 2020-12-12 09:45:08 +01:00
parent 66dbe5639e
commit 42cb9bd6a5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api2/tape/changer.rs
View File

@ -46,13 +46,15 @@ use crate::{
}, },
)] )]
/// Get tape changer status /// Get tape changer status
pub fn get_status(name: String) -> Result<Vec<MtxStatusEntry>, Error> { pub async fn get_status(name: String) -> Result<Vec<MtxStatusEntry>, Error> {
let (config, _digest) = config::drive::config()?; let (config, _digest) = config::drive::config()?;
let data: ScsiTapeChanger = config.lookup("changer", &name)?; let data: ScsiTapeChanger = config.lookup("changer", &name)?;
let status = mtx_status(&data.path)?; let status = tokio::task::spawn_blocking(move || {
mtx_status(&data.path)
}).await??;
let state_path = Path::new(TAPE_STATUS_DIR); let state_path = Path::new(TAPE_STATUS_DIR);
let inventory = Inventory::load(state_path)?; let inventory = Inventory::load(state_path)?;
@ -115,7 +117,7 @@ pub fn get_status(name: String) -> Result<Vec<MtxStatusEntry>, Error> {
}, },
)] )]
/// Transfers media from one slot to another /// Transfers media from one slot to another
pub fn transfer( pub async fn transfer(
name: String, name: String,
from: u64, from: u64,
to: u64, to: u64,
@ -125,9 +127,9 @@ pub fn transfer(
let data: ScsiTapeChanger = config.lookup("changer", &name)?; let data: ScsiTapeChanger = config.lookup("changer", &name)?;
mtx_transfer(&data.path, from, to)?; tokio::task::spawn_blocking(move || {
mtx_transfer(&data.path, from, to)
Ok(()) }).await?
} }
#[api( #[api(