From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] api2/pull: make pull worker abortable
Date: Tue, 15 Sep 2020 11:15:01 +0200 [thread overview]
Message-ID: <20200915091501.28979-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20200915091501.28979-1-d.csapak@proxmox.com>
by selecting between the pull_future and the abort future
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/pull.rs | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/api2/pull.rs b/src/api2/pull.rs
index fc13cf40..09e27a17 100644
--- a/src/api2/pull.rs
+++ b/src/api2/pull.rs
@@ -176,7 +176,13 @@ async fn pull (
worker.log(format!("sync datastore '{}' start", store));
- pull_store(&worker, &client, &src_repo, tgt_store.clone(), delete, userid).await?;
+ let pull_future = pull_store(&worker, &client, &src_repo, tgt_store.clone(), delete, userid);
+ let future = select!{
+ success = pull_future.fuse() => success,
+ abort = worker.abort_future().map(|_| Err(format_err!("pull aborted"))) => abort,
+ };
+
+ let _ = future?;
worker.log(format!("sync datastore '{}' end", store));
--
2.20.1
next prev parent reply other threads:[~2020-09-15 9:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 9:15 [pbs-devel] [PATCH proxmox-backup 1/2] fix #2870: renew tickets in HttpClient Dominik Csapak
2020-09-15 9:15 ` Dominik Csapak [this message]
2020-09-17 4:11 ` [pbs-devel] applied: [PATCH proxmox-backup 2/2] api2/pull: make pull worker abortable Dietmar Maurer
2020-09-17 4:11 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] fix #2870: renew tickets in HttpClient Dietmar Maurer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200915091501.28979-2-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox