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 7C4C264F7D for ; Tue, 21 Jul 2020 15:04:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 72F7818CF8 for ; Tue, 21 Jul 2020 15:03:49 +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 4E92C18CEC for ; Tue, 21 Jul 2020 15:03:48 +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 1A7BC40B01 for ; Tue, 21 Jul 2020 15:03:48 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 21 Jul 2020 15:03:33 +0200 Message-Id: <20200721130337.934653-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200721130337.934653-1-f.gruenbichler@proxmox.com> References: <20200721130337.934653-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.085 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pull.rs] Subject: [pbs-devel] [PATCH proxmox-backup 2/6] fix #2860: skip in-progress snapshots when syncing 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: Tue, 21 Jul 2020 13:04:19 -0000 they don't have a final manifest yet and are not done, so they can't be synced either. Signed-off-by: Fabian Grünbichler --- src/client/pull.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/client/pull.rs b/src/client/pull.rs index 5cf0dd1f..bbe01969 100644 --- a/src/client/pull.rs +++ b/src/client/pull.rs @@ -6,7 +6,6 @@ use std::convert::TryFrom; use std::sync::Arc; use std::collections::HashMap; use std::io::{Seek, SeekFrom}; -use chrono::{Utc, TimeZone}; use crate::server::{WorkerTask}; use crate::backup::*; @@ -302,7 +301,16 @@ pub async fn pull_group( let mut remote_snapshots = std::collections::HashSet::new(); for item in list { - let backup_time = Utc.timestamp(item.backup_time, 0); + let snapshot = BackupDir::new(item.backup_type, item.backup_id, item.backup_time); + + // in-progress backups can't be synced + if let None = item.size { + worker.log(format!("skipping snapshot {} - in-progress backup", snapshot)); + continue; + } + + let backup_time = snapshot.backup_time(); + remote_snapshots.insert(backup_time); if let Some(last_sync_time) = last_sync { @@ -319,14 +327,12 @@ pub async fn pull_group( new_client, None, src_repo.store(), - &item.backup_type, - &item.backup_id, + snapshot.group().backup_type(), + snapshot.group().backup_id(), backup_time, true, ).await?; - let snapshot = BackupDir::new(item.backup_type, item.backup_id, item.backup_time); - pull_snapshot_from(worker, reader, tgt_store.clone(), &snapshot).await?; } -- 2.20.1