From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 98A3C1FF2AB for ; Tue, 2 Jul 2024 10:50:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A4D0B18E6C; Tue, 2 Jul 2024 10:50:28 +0200 (CEST) Date: Tue, 02 Jul 2024 10:50:23 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240618140402.312627-1-g.goller@proxmox.com> In-Reply-To: <20240618140402.312627-1-g.goller@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1719910216.miwxt242vt.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.051 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mount.rs, proxmox.com] Subject: [pbs-devel] applied: [PATCH proxmox-backup v4] client: mount: wait for child to return before exiting 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" On June 18, 2024 4:03 pm, Gabriel Goller wrote: > When using the `proxmox-backup-client mount` command, the parent sometimes > exits before we can print any error message. Most notably this happens > when no PBS_REPOSITORY is passed, as this is the first option checked. > If the underlying file descriptor has been closed, wait for the client > to complete and return the error message. > > Reported-by: Friedrich Weber > Suggested-by: Christian Ebner > Signed-off-by: Gabriel Goller > --- > > v4, thanks @Wobu: > - Use [u8] instead of Vec > > v3, thanks @Christian, @Friedrich: > - Removed stdout/stderr flush (which didn't solve the problem) > - Wait for child to finish > > v2, thanks @Christian: > - Removed unneeded pw.try_clone() > proxmox-backup-client/src/mount.rs | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/proxmox-backup-client/src/mount.rs b/proxmox-backup-client/src/mount.rs > index b69e7e80..ee7cfec2 100644 > --- a/proxmox-backup-client/src/mount.rs > +++ b/proxmox-backup-client/src/mount.rs > @@ -183,7 +183,17 @@ fn mount( > Ok(ForkResult::Parent { .. }) => { > drop(pw); > // Blocks the parent process until we are ready to go in the child > - let _res = nix::unistd::read(pr.as_raw_fd(), &mut [0]).unwrap(); > + let mut buffer = [0u8]; > + nix::unistd::read(pr.as_raw_fd(), &mut buffer).unwrap(); > + > + // Read buffer didn't change, which indicates that nothing has been read and the file > + // descriptor has probably been closed. This means that there was an error in the child > + // process and it did not daemonize correctly. > + if buffer[0] == 0 { > + // Wait for the child process to finish, so it can return a nice error. > + nix::sys::wait::wait().unwrap(); > + } > + > Ok(Value::Null) > } > Ok(ForkResult::Child) => { > @@ -264,7 +274,7 @@ async fn mount_do(param: Value, pipe: Option) -> Result { > } > // Signal the parent process that we are done with the setup and it can > // terminate. > - nix::unistd::write(pipe.as_raw_fd(), &[0u8])?; > + nix::unistd::write(pipe.as_raw_fd(), &[1u8])?; > let _: OwnedFd = pipe; > } > > -- > 2.43.0 > > > > _______________________________________________ > 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