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 901961FF37F for ; Tue, 18 Jun 2024 15:36:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A57EB1BB1E; Tue, 18 Jun 2024 15:36:33 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Tue, 18 Jun 2024 15:35:56 +0200 Message-ID: <20240618133558.290048-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.056 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 T_SCC_BODY_TEXT_LINE -0.01 - 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] Subject: [pbs-devel] [PATCH proxmox-backup v3] 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" 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 --- 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..966ea1f9 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: Vec = vec![0]; + 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