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 D52E77372B for ; Fri, 18 Jun 2021 11:29:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C79DF25589 for ; Fri, 18 Jun 2021 11:29:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id A540225577 for ; Fri, 18 Jun 2021 11:29:17 +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 5DB5044206 for ; Fri, 18 Jun 2021 11:29:11 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 18 Jun 2021 11:29:10 +0200 Message-Id: <20210618092910.4518-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210618092910.4518-1-d.csapak@proxmox.com> References: <20210618092910.4518-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.881 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 proxmox-backup 2/2] tape/helpers/snapshot_reader: sort chunks by inode (per index) 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: Fri, 18 Jun 2021 09:29:48 -0000 sort the chunks we want to backup to tape by inode, to gain some speed on spinning disks. this is done per index, not globally. costs a bit memory, but not too much, about 16 bytes per chunk which would mean ~4MiB for a 1TiB index with 4MiB chunks. Signed-off-by: Dominik Csapak --- this resulted in a speedup in my setup of between 20 and 30% (single spinner with random snapshots, from 17-26MiB/s to 30-40MiB/s) we already do this for verification, but got no real feedback on it, so either it does not make that much of a difference in the real world, or it is not that visible on verification (since that varies very much anyway) src/tape/helpers/snapshot_reader.rs | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/tape/helpers/snapshot_reader.rs b/src/tape/helpers/snapshot_reader.rs index 7b272e37..416c88c1 100644 --- a/src/tape/helpers/snapshot_reader.rs +++ b/src/tape/helpers/snapshot_reader.rs @@ -107,7 +107,7 @@ impl SnapshotReader { pub struct SnapshotChunkIterator<'a> { snapshot_reader: &'a SnapshotReader, todo_list: Vec, - current_index: Option<(Arc>, usize)>, + current_index: Option<(Arc>, usize, Vec<(usize, u64)>)>, } impl <'a> Iterator for SnapshotChunkIterator<'a> { @@ -119,20 +119,26 @@ impl <'a> Iterator for SnapshotChunkIterator<'a> { if self.current_index.is_none() { if let Some(filename) = self.todo_list.pop() { let file = self.snapshot_reader.open_file(&filename)?; - let index: Box = match archive_type(&filename)? { + let index: Box = match archive_type(&filename)? { ArchiveType::FixedIndex => Box::new(FixedIndexReader::new(file)?), ArchiveType::DynamicIndex => Box::new(DynamicIndexReader::new(file)?), _ => bail!("SnapshotChunkIterator: got unknown file type - internal error"), }; - self.current_index = Some((Arc::new(index), 0)); + + let datastore = + DataStore::lookup_datastore(self.snapshot_reader.datastore_name())?; + let order = datastore.get_chunks_in_order(&index, |_| false, |_| Ok(()))?; + + self.current_index = Some((Arc::new(index), 0, order)); } else { return Ok(None); } } - let (index, pos) = self.current_index.take().unwrap(); - if pos < index.index_count() { - let digest = *index.index_digest(pos).unwrap(); - self.current_index = Some((index, pos + 1)); + let (index, pos, list) = self.current_index.take().unwrap(); + if pos < list.len() { + let (real_pos, _) = list[pos]; + let digest = *index.index_digest(real_pos).unwrap(); + self.current_index = Some((index, pos + 1, list)); return Ok(Some(digest)); } else { // pop next index -- 2.20.1