From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 18C2864816 for ; Mon, 20 Jul 2020 17:02:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 113DDF4E2 for ; Mon, 20 Jul 2020 17:02:28 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 81D6FF4C8 for ; Mon, 20 Jul 2020 17:02:26 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 468344325D for ; Mon, 20 Jul 2020 17:02:26 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Mon, 20 Jul 2020 17:02:19 +0200 Message-Id: <20200720150220.22996-3-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200720150220.22996-1-s.reiter@proxmox.com> References: <20200720150220.22996-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH backup-qemu 2/3] use new async BufferedFixedReader API X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jul 2020 15:02:58 -0000 Signed-off-by: Stefan Reiter --- Requires dependency bump on proxmox-backup, and while at it maybe the proxmox crate to 0.2 as well? (no issues in my testing, I've been building with 0.2.0 for a while now, since it's the one in the repos). src/restore.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/restore.rs b/src/restore.rs index 3e37066..9995743 100644 --- a/src/restore.rs +++ b/src/restore.rs @@ -1,13 +1,12 @@ use std::sync::{Arc, Mutex}; use std::collections::HashMap; -use std::io::{Read, Seek, SeekFrom}; use std::convert::TryInto; use anyhow::{format_err, bail, Error}; use once_cell::sync::OnceCell; use tokio::runtime::Runtime; -use proxmox_backup::tools::runtime::{get_runtime_with_builder, block_in_place}; +use proxmox_backup::tools::runtime::get_runtime_with_builder; use proxmox_backup::backup::*; use proxmox_backup::client::{HttpClient, HttpClientOptions, BackupReader, RemoteChunkReader}; @@ -16,7 +15,7 @@ use crate::registry::Registry; use crate::capi_types::DataPointer; struct ImageAccessInfo { - reader: Arc>>, + reader: Arc>, _archive_name: String, archive_size: u64, } @@ -236,7 +235,7 @@ impl RestoreTask { let info = ImageAccessInfo { archive_size, _archive_name: archive_name, /// useful to debug - reader: Arc::new(Mutex::new(reader)), + reader: Arc::new(reader), }; (*self.image_registry.lock().unwrap()).register(info) @@ -260,12 +259,9 @@ impl RestoreTask { bail!("read index {} out of bounds {}", offset, image_size); } - let bytes = block_in_place(|| { - let mut reader = reader.lock().unwrap(); - reader.seek(SeekFrom::Start(offset))?; - let buf: &mut [u8] = unsafe { std::slice::from_raw_parts_mut(data.0 as *mut u8, size as usize)}; - reader.read(buf) - })?; + let size = size as usize; + let buf: &mut [u8] = unsafe { std::slice::from_raw_parts_mut(data.0 as *mut u8, size)}; + let bytes = reader.async_buffered_read(buf, size, offset).await?; Ok(bytes.try_into()?) } -- 2.20.1