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 574F671E06 for ; Fri, 9 Apr 2021 16:18:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4D548279BF for ; Fri, 9 Apr 2021 16:18:07 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 81115279AF for ; Fri, 9 Apr 2021 16:18:05 +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 4F70D41FD8 for ; Fri, 9 Apr 2021 16:18:05 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 9 Apr 2021 16:18:03 +0200 Message-Id: <20210409141804.2496-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.167 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 Subject: [pbs-devel] [PATCH proxmox-backup 1/2] tape/file_formats/blocked_reader: restore EOD behaviour 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: Fri, 09 Apr 2021 14:18:37 -0000 before commit 0db571249 ("tape: introduce BlockRead") we did not return an error on EOD, but changed that. The rest of the code assumes to be able to read there and not encounter an error, so that change resulted in 'no space left on device' errors on all tasks/api calls where we would read to the end of the tape, e.g. a restore, read label on an empty tape, etc. This patch restores the previous behaviour. Signed-off-by: Dominik Csapak --- not sure if this is the intended behavior, but fixes many 'no space on device' errors we encounter currently if the intention was that we catch the enospc error explicitely on the caller side, we would have to invent our own error type here, as this results in an io::Error with ErrorKind::Other (makes matching a bit weird) src/tape/file_formats/blocked_reader.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/tape/file_formats/blocked_reader.rs b/src/tape/file_formats/blocked_reader.rs index 3df84a1b..e7dfa90a 100644 --- a/src/tape/file_formats/blocked_reader.rs +++ b/src/tape/file_formats/blocked_reader.rs @@ -111,12 +111,9 @@ impl BlockedReader { } Ok(true) } - Ok(BlockReadStatus::EndOfFile) => { + Ok(BlockReadStatus::EndOfFile) | Ok(BlockReadStatus::EndOfStream)=> { Ok(false) } - Ok(BlockReadStatus::EndOfStream) => { - return Err(std::io::Error::from_raw_os_error(nix::errno::Errno::ENOSPC as i32)); - } Err(err) => { Err(err) } -- 2.20.1