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 9D9176910D for ; Tue, 4 Aug 2020 12:42:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6B882BDA3 for ; Tue, 4 Aug 2020 12:42:25 +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 A188BBD73 for ; Tue, 4 Aug 2020 12:42:23 +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 64C1743479 for ; Tue, 4 Aug 2020 12:42:23 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Tue, 4 Aug 2020 12:41:59 +0200 Message-Id: <20200804104205.29540-2-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200804104205.29540-1-s.reiter@proxmox.com> References: <20200804104205.29540-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.062 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. [environment.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/7] finish_backup: mark backup as finished only after checks have passed 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, 04 Aug 2020 10:42:25 -0000 Commit 9fa55e09 "finish_backup: test/verify manifest at server side" moved the finished-marking above some checks, which means if those fail the backup would still be marked as successful on the server. Revert that part and comment the line for the future. Signed-off-by: Stefan Reiter --- src/api2/backup/environment.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs index 02aa0c40..bc780d20 100644 --- a/src/api2/backup/environment.rs +++ b/src/api2/backup/environment.rs @@ -477,8 +477,6 @@ impl BackupEnvironment { bail!("backup does not contain valid files (file count == 0)"); } - state.finished = true; - // check manifest let mut manifest = self.datastore.load_manifest_json(&self.backup_dir) .map_err(|err| format_err!("unable to load manifest blob - {}", err))?; @@ -500,6 +498,8 @@ impl BackupEnvironment { } } + // marks the backup as successful + state.finished = true; Ok(()) } -- 2.20.1