From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 14BB51FF170 for ; Tue, 17 Dec 2024 16:12:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 764D543A0; Tue, 17 Dec 2024 16:13:01 +0100 (CET) From: Filip Schauer To: pbs-devel@lists.proxmox.com Date: Tue, 17 Dec 2024 16:12:55 +0100 Message-Id: <20241217151255.155032-1-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.026 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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. [vma2pbs.rs] Subject: [pbs-devel] [PATCH vma-to-pbs] fix #5994: wait for decompression processes to exit 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Wait for zstd, lzop or zcat processes to exit when uploading a compressed VMA file. This prevents these processes from lingering as zombies. Also check the exit code of the processes, to detect potential failures during decompression. Signed-off-by: Filip Schauer --- src/vma2pbs.rs | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/vma2pbs.rs b/src/vma2pbs.rs index 7457b9a..1be52b9 100644 --- a/src/vma2pbs.rs +++ b/src/vma2pbs.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use std::ffi::{c_char, CStr, CString, OsString}; use std::fs::File; use std::io::{stdin, BufRead, BufReader, Read}; -use std::process::{Command, Stdio}; +use std::process::{Child, Command, Stdio}; use std::ptr; use std::sync::atomic::{AtomicU64, Ordering}; use std::sync::Arc; @@ -515,7 +515,7 @@ fn upload_vma_file(pbs_args: &PbsArgs, backup_args: &VmaBackupArgs) -> Result<() None => log::info!("Uploading VMA backup from (stdin)"), }; - let vma_file: Box = match &backup_args.compression { + let (vma_file, decompproc): (Box, Option) = match &backup_args.compression { Some(compression) => { let vma_file_path = backup_args .vma_file_path @@ -534,16 +534,16 @@ fn upload_vma_file(pbs_args: &PbsArgs, backup_args: &VmaBackupArgs) -> Result<() } Compression::GZip => Command::new("zcat"), }; - let process = cmd.arg(vma_file_path).stdout(Stdio::piped()).spawn()?; - let stdout = process.stdout.expect("Failed to capture stdout"); - Box::new(BufReader::new(stdout)) + let mut process = cmd.arg(vma_file_path).stdout(Stdio::piped()).spawn()?; + let stdout = process.stdout.take().expect("Failed to capture stdout"); + (Box::new(BufReader::new(stdout)), Some(process)) } None => match &backup_args.vma_file_path { Some(vma_file_path) => match File::open(vma_file_path) { Err(why) => return Err(anyhow!("Couldn't open file: {why}")), - Ok(file) => Box::new(BufReader::new(file)), + Ok(file) => (Box::new(BufReader::new(file)), None), }, - None => Box::new(BufReader::new(stdin())), + None => (Box::new(BufReader::new(stdin())), None), }, }; @@ -565,6 +565,14 @@ fn upload_vma_file(pbs_args: &PbsArgs, backup_args: &VmaBackupArgs) -> Result<() upload_configs(&vma_reader, pbs)?; upload_block_devices(vma_reader, pbs)?; + if let Some(mut decompproc) = decompproc { + let status = decompproc.wait()?; + + if !status.success() { + bail!("Failed to decompress file with exit code: {status}"); + } + } + if proxmox_backup_finish(pbs, &mut pbs_err) < 0 { handle_pbs_error(pbs_err, "proxmox_backup_finish")?; } -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel