all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Laurențiu Leahu-Vlăducu" <l.leahu-vladucu@proxmox.com>
To: pbs-devel@lists.proxmox.com
Cc: "Laurențiu Leahu-Vlăducu" <l.leahu-vladucu@proxmox.com>
Subject: [pbs-devel] [PATCH proxmox-backup 1/1] backup-proxy and parallel_handler: Improved errors when panics occur and the panic message is a formatted (not static) string. This worked already for &str literals, but not for Strings.
Date: Tue, 21 Jan 2025 10:36:11 +0100	[thread overview]
Message-ID: <20250121093612.43094-2-l.leahu-vladucu@proxmox.com> (raw)
In-Reply-To: <20250121093612.43094-1-l.leahu-vladucu@proxmox.com>

Downcasting to both &str and String is also done by the Rust Standard
Library in the default panic handler. See:
https://github.com/rust-lang/rust/blob/b605c65b6eb5fa71783f8e26df69975f9f1680ee/library/std/src/panicking.rs#L777

Signed-off-by: Laurențiu Leahu-Vlăducu <l.leahu-vladucu@proxmox.com>
---
 src/bin/proxmox-backup-proxy.rs | 5 ++++-
 src/tools/parallel_handler.rs   | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index ce1be1c0..a7dab4ac 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -424,7 +424,10 @@ async fn run_task_scheduler() {
         match schedule_tasks().catch_unwind().await {
             Err(panic) => match panic.downcast::<&str>() {
                 Ok(msg) => eprintln!("task scheduler panic: {msg}"),
-                Err(_) => eprintln!("task scheduler panic - unknown type"),
+                Err(panic) => match panic.downcast::<String>() {
+                    Ok(msg) => eprintln!("task scheduler panic: {msg}"),
+                    Err(_) => eprintln!("task scheduler panic - cannot show error message due to unknown error type")
+                }
             },
             Ok(Err(err)) => eprintln!("task scheduler failed - {err:?}"),
             Ok(Ok(_)) => {}
diff --git a/src/tools/parallel_handler.rs b/src/tools/parallel_handler.rs
index 17f70179..429a1f8b 100644
--- a/src/tools/parallel_handler.rs
+++ b/src/tools/parallel_handler.rs
@@ -140,7 +140,13 @@ impl<I: Send + 'static> ParallelHandler<I> {
                         "thread {} ({}) panicked: {}",
                         self.name, i, panic_msg
                     )),
-                    Err(_) => msg_list.push(format!("thread {} ({}) panicked", self.name, i)),
+                    Err(panic) => match panic.downcast::<String>() {
+                        Ok(panic_msg) => msg_list.push(format!(
+                            "thread {} ({}) panicked: {}",
+                                self.name, i, panic_msg
+                        )),
+                        Err(_) => msg_list.push(format!("thread {} ({}) panicked", self.name, i))
+                    },
                 }
             }
             i += 1;
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

  reply	other threads:[~2025-01-21  9:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-21  9:36 [pbs-devel] [PATCH proxmox/proxmox-backup 0/1] Improve errors when panics occur and the panic message is a formatted (not static) string Laurențiu Leahu-Vlăducu
2025-01-21  9:36 ` Laurențiu Leahu-Vlăducu [this message]
2025-01-21 10:56   ` [pbs-devel] [PATCH proxmox-backup 1/1] backup-proxy and parallel_handler: Improved errors when panics occur and the panic message is a formatted (not static) string. This worked already for &str literals, but not for Strings Gabriel Goller
2025-01-21 13:14     ` Laurențiu Leahu-Vlăducu
2025-01-21 13:17     ` Shannon Sterz
2025-01-21  9:36 ` [pbs-devel] [PATCH proxmox 1/1] rest-server: " Laurențiu Leahu-Vlăducu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250121093612.43094-2-l.leahu-vladucu@proxmox.com \
    --to=l.leahu-vladucu@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal