From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 500FF1FF16B
for <inbox@lore.proxmox.com>; Thu, 6 Feb 2025 15:20:31 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 8132C2882E;
Thu, 6 Feb 2025 15:20:29 +0100 (CET)
Date: Thu, 6 Feb 2025 15:20:25 +0100
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Filip Schauer <f.schauer@proxmox.com>
Message-ID: <7s66qv4gugem6jmaevpfreers4y53oqtus6w6cg2rfhw2rgwiu@upubw7upowdb>
References: <20241217151255.155032-1-f.schauer@proxmox.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20241217151255.155032-1-f.schauer@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.084 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
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] applied: [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
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
applied, thanks
On Tue, Dec 17, 2024 at 04:12:55PM +0100, Filip Schauer wrote:
> 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 <f.schauer@proxmox.com>
> ---
> 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<dyn BufRead> = match &backup_args.compression {
> + let (vma_file, decompproc): (Box<dyn BufRead>, Option<Child>) = 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
>
>
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel