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

src/api2/admin/datastore/h2upload.rs: make worker abortable

This commit is contained in:
Dietmar Maurer 2019-05-08 07:14:40 +02:00
parent 72375ce6c6
commit a66ab8ae5e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api2/admin/datastore/h2upload.rs
View File

@ -163,6 +163,8 @@ fn upgrade_h2upload(
WorkerTask::spawn("test2_download", Some(worker_id), &rpcenv.get_user().unwrap(), true, move |worker| { WorkerTask::spawn("test2_download", Some(worker_id), &rpcenv.get_user().unwrap(), true, move |worker| {
let service = BackupService::new(rpcenv1, worker.clone()); let service = BackupService::new(rpcenv1, worker.clone());
let abort_future = worker.abort_future();
req_body req_body
.on_upgrade() .on_upgrade()
.map_err(Error::from) .map_err(Error::from)
@ -179,6 +181,14 @@ fn upgrade_h2upload(
x x
}) })
}) })
.select(abort_future.map_err(|_| {}).then(move |_| { bail!("task aborted"); }))
.then(|result| {
match result {
Ok((result,_)) => Ok(result),
Err((err, _)) => Err(err),
}
})
}).unwrap(); }).unwrap();
Ok(Box::new(futures::future::ok( Ok(Box::new(futures::future::ok(
@ -235,7 +245,7 @@ fn test2_get(
let fut = tokio::timer::Interval::new_interval(std::time::Duration::from_millis(300)) let fut = tokio::timer::Interval::new_interval(std::time::Duration::from_millis(300))
.map_err(|err| http_err!(INTERNAL_SERVER_ERROR, format!("tokio timer interval error: {}", err))) .map_err(|err| http_err!(INTERNAL_SERVER_ERROR, format!("tokio timer interval error: {}", err)))
.take(10) .take(50)
.for_each(|tv| { .for_each(|tv| {
println!("LOOP {:?}", tv); println!("LOOP {:?}", tv);
Ok(()) Ok(())