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

src/api2/admin/datastore.rs: use new WorkerTask::new_thread()

This commit is contained in:
Dietmar Maurer 2019-04-06 11:27:23 +02:00
parent 23c8415dbe
commit 0f778e0652
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api2/admin/datastore.rs
View File

@ -16,6 +16,7 @@ use std::sync::Arc;
use crate::config::datastore; use crate::config::datastore;
use crate::backup::*; use crate::backup::*;
use crate::server::WorkerTask;
mod pxar; mod pxar;
mod upload; mod upload;
@ -285,7 +286,7 @@ fn api_method_prune() -> ApiMethod {
fn start_garbage_collection( fn start_garbage_collection(
param: Value, param: Value,
_info: &ApiMethod, _info: &ApiMethod,
_rpcenv: &mut RpcEnvironment, rpcenv: &mut RpcEnvironment,
) -> Result<Value, Error> { ) -> Result<Value, Error> {
let store = param["store"].as_str().unwrap().to_string(); let store = param["store"].as_str().unwrap().to_string();
@ -294,13 +295,16 @@ fn start_garbage_collection(
println!("Starting garbage collection on store {}", store); println!("Starting garbage collection on store {}", store);
std::thread::spawn(move || { let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false };
if let Err(err) = datastore.garbage_collection() {
println!("Garbage collection error on store {} - {}", store, err);
}
});
Ok(json!(null)) let upid_str = WorkerTask::new_thread(
"garbage_collection", Some(store.clone()), "root@pam", to_stdout, move |worker|
{
worker.log(format!("starting garbage collection on store {}", store));
datastore.garbage_collection()
})?;
Ok(json!(upid_str))
} }
pub fn api_method_start_garbage_collection() -> ApiMethod { pub fn api_method_start_garbage_collection() -> ApiMethod {