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 0B3AB1FF17C for ; Wed, 23 Jul 2025 11:14:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5E968C418; Wed, 23 Jul 2025 11:15:51 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 23 Jul 2025 11:13:57 +0200 Message-ID: <20250723091357.353331-1-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753262107525 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 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 Subject: [pbs-devel] [PATCH proxmox] s3 client: fix invalid request for empty delete_objects call 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" The s3 client's object_delete method does not correctly handle cases where an empty list of object keys is passed via the parameters, resulting in an `invalid request` error. Handle this by early returning in case of an empty list, thereby also skipping the unneeded api request altogether. This indirectly fixes the snapshot directory cleanup for proxmox-backup-client benchmark or aborted backups, where no objects have been persisted to the object store within the snapshot prefix yet, therefore trying to delete the empty list. Reported-by: Dominik Csapak Signed-off-by: Christian Ebner --- Note: as this indirectly fixes an issue in PBS, latter must be build against a bumped version of the proxmox-s3-client. Further, I'm working on improving the error logging for such invalid requests, as they currently do not log the error in the response body (if any) in these cases. proxmox-s3-client/src/client.rs | 4 ++++ proxmox-s3-client/src/response_reader.rs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/proxmox-s3-client/src/client.rs b/proxmox-s3-client/src/client.rs index eb5fc7d9..3a981bf4 100644 --- a/proxmox-s3-client/src/client.rs +++ b/proxmox-s3-client/src/client.rs @@ -423,6 +423,10 @@ impl S3Client { &self, object_keys: &[S3ObjectKey], ) -> Result { + if object_keys.is_empty() { + return Ok(DeleteObjectsResponse::default()); + } + let mut body = String::from(r#""#); for object_key in object_keys { body.push_str(""); diff --git a/proxmox-s3-client/src/response_reader.rs b/proxmox-s3-client/src/response_reader.rs index 41e8c6d8..f0baa107 100644 --- a/proxmox-s3-client/src/response_reader.rs +++ b/proxmox-s3-client/src/response_reader.rs @@ -107,7 +107,7 @@ pub enum PutObjectResponse { /// Subset of the delete objects response /// https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjects.html#API_DeleteObjects_ResponseElements -#[derive(Deserialize, Debug)] +#[derive(Deserialize, Debug, Default)] #[serde(rename_all = "PascalCase")] pub struct DeleteObjectsResponse { pub deleted: Option>, -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel