all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-backup 2/5] restore-daemon: put blocking code into 'block_in_place'
Date: Thu, 27 Jan 2022 11:55:55 +0100	[thread overview]
Message-ID: <20220127105601.2741602-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220127105601.2741602-1-d.csapak@proxmox.com>

DISK_STATE.lock() and '.resolve()' can both block since they access
the disks. Putting them into a 'block_in_place' tells tokio that
this blocks an it can act accordingly

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 .../src/proxmox_restore_daemon/api.rs                | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
index 4c755210..0c89fd82 100644
--- a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
+++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
@@ -145,8 +145,10 @@ fn list(
     let path_str = OsStr::from_bytes(&path[..]);
     let param_path_buf = Path::new(path_str);
 
-    let mut disk_state = crate::DISK_STATE.lock().unwrap();
-    let query_result = disk_state.resolve(param_path_buf)?;
+    let query_result = proxmox_async::runtime::block_in_place(move || {
+        let mut disk_state = crate::DISK_STATE.lock().unwrap();
+        disk_state.resolve(param_path_buf)
+    })?;
 
     match query_result {
         ResolveResult::Path(vm_path) => {
@@ -269,10 +271,10 @@ fn extract(
 
         let pxar = param["pxar"].as_bool().unwrap_or(true);
 
-        let query_result = {
+        let query_result = proxmox_async::runtime::block_in_place(move || {
             let mut disk_state = crate::DISK_STATE.lock().unwrap();
-            disk_state.resolve(path)?
-        };
+            disk_state.resolve(path)
+        })?;
 
         let vm_path = match query_result {
             ResolveResult::Path(vm_path) => vm_path,
-- 
2.30.2





  parent reply	other threads:[~2022-01-27 10:56 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-27 10:55 [pve-devel] [PATCH proxmox-backup/common/storage/wt] improve file-restore timeout behaviour Dominik Csapak
2022-01-27 10:55 ` [pve-devel] [PATCH proxmox-backup 1/5] restore-daemon: start disk initialization in parallel to the api Dominik Csapak
2022-01-27 10:55 ` Dominik Csapak [this message]
2022-01-27 10:55 ` [pve-devel] [PATCH proxmox-backup 3/5] restore-daemon: avoid auto-mounting zpools Dominik Csapak
2022-01-27 10:55 ` [pve-devel] [PATCH proxmox-backup 4/5] file-restore: factor out 'list_files' Dominik Csapak
2022-01-27 10:55 ` [pve-devel] [PATCH proxmox-backup 5/5] file-restore: add 'timeout' and 'json-error' parameter Dominik Csapak
2022-01-27 10:55 ` [pve-devel] [PATCH common 1/1] PBSClient: add option for extra parameter to file_restore_list Dominik Csapak
2022-02-09 17:35   ` Thomas Lamprecht
2022-02-10  8:30     ` Wolfgang Bumiller
2022-01-27 10:56 ` [pve-devel] [PATCH storage 1/1] api: FileRestore: use new timeout and json-error parameters for list Dominik Csapak
2022-01-27 10:56 ` [pve-devel] [PATCH widget-toolkit 1/1] window/FileBrowser: try reload again when getting a 503 error Dominik Csapak

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=20220127105601.2741602-3-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pve-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal