From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 375861FF163 for ; Thu, 21 Nov 2024 16:43:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B4D5E100B; Thu, 21 Nov 2024 16:44:02 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 21 Nov 2024 16:43:36 +0100 Message-Id: <20241121154337.471425-4-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241121154337.471425-1-c.ebner@proxmox.com> References: <20241121154337.471425-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 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] [PATCH proxmox-backup 3/4] server: push: add error context to all target api calls 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" Make it clear from the context that these error messages stem from the response of an api call rather than a local error. Signed-off-by: Christian Ebner --- src/server/push.rs | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/server/push.rs b/src/server/push.rs index 86cef5520..fe2e11220 100644 --- a/src/server/push.rs +++ b/src/server/push.rs @@ -219,7 +219,9 @@ async fn remove_target_namespace( if params.target.supports_prune_delete_stats { let data = result["data"].take(); serde_json::from_value(data).map_err(|err| { - format_err!("removing target namespace {target_namespace} failed - {err}") + format_err!( + "Failed to remove remote namespace {target_namespace}, remote returned: {err}" + ) }) } else { Ok(BackupGroupDeleteStats::default()) @@ -236,7 +238,8 @@ async fn fetch_target_groups( let args = Some(serde_json::json!({ "ns": target_namespace.name() })); let mut result = params.target.client.get(&api_path, args).await?; - let groups: Vec = serde_json::from_value(result["data"].take())?; + let groups: Vec = serde_json::from_value(result["data"].take()) + .map_err(|err| format_err!("Failed to fetch remote groups, remote returned: {err}"))?; let (mut owned, not_owned) = groups.into_iter().fold( (Vec::new(), HashSet::new()), @@ -277,8 +280,9 @@ async fn remove_target_group( if params.target.supports_prune_delete_stats { let data = result["data"].take(); - serde_json::from_value(data) - .map_err(|err| format_err!("removing target group {backup_group} failed - {err}")) + serde_json::from_value(data).map_err(|err| { + format_err!("Failed to remove remote group {backup_group}, remote returned: {err}") + }) } else { Ok(BackupGroupDeleteStats::default()) } @@ -313,7 +317,7 @@ async fn check_or_create_target_namespace( match params.target.client.post(&api_path, Some(args)).await { Ok(_) => info!("Successfully created new namespace {current} on remote"), Err(err) => { - bail!("Remote creation of namespace {current} failed, remote returned: {err}") + bail!("Creation of remote namespace {current} failed, remote returned: {err}") } } existing_target_namespaces.push(current.clone()); @@ -585,7 +589,8 @@ async fn fetch_target_snapshots( args["ns"] = serde_json::to_value(target_namespace)?; } let mut result = params.target.client.get(&api_path, Some(args)).await?; - let snapshots: Vec = serde_json::from_value(result["data"].take())?; + let snapshots: Vec = serde_json::from_value(result["data"].take()) + .map_err(|err| format_err!("Failed to fetch remote snapshots, remote returned: {err}"))?; Ok(snapshots) } @@ -603,7 +608,12 @@ async fn forget_target_snapshot( if !target_namespace.is_root() { args["ns"] = serde_json::to_value(target_namespace)?; } - params.target.client.delete(&api_path, Some(args)).await?; + params + .target + .client + .delete(&api_path, Some(args)) + .await + .map_err(|err| format_err!("Failed to remove remote snapshot, remote returned: {err}"))?; Ok(()) } -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel