From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] datastore: improve error on maintenance mode failure with empty message
Date: Fri, 19 Nov 2021 16:23:28 +0100 [thread overview]
Message-ID: <20211119152328.1866593-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20211119152328.1866593-1-d.csapak@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
pbs-datastore/src/datastore.rs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index 9cb19e79..e03935bd 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -214,7 +214,11 @@ impl DataStore {
match (&config.maintenance_type, operation.clone()) {
(Some(MaintenanceType::ReadOnly(message)), Some(Operation::Write))
| (Some(MaintenanceType::Offline(message)), Some(_)) => {
- bail!("Datastore '{}' is in maintenance mode: {}", name, message);
+ if message.is_empty() {
+ bail!("Datastore '{}' is in maintenance mode", name);
+ } else {
+ bail!("Datastore '{}' is in maintenance mode: {}", name, message);
+ }
},
(_, Some(operation)) => update_active_operations(name, operation, 1)?,
_ => {}
--
2.30.2
prev parent reply other threads:[~2021-11-19 15:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-19 15:23 [pbs-devel] [PATCH proxmox-backup 0/2] maintenance mode followups Dominik Csapak
2021-11-19 15:23 ` [pbs-devel] [PATCH proxmox-backup 1/2] api: tape: fix datastore lookup operations Dominik Csapak
2021-11-19 15:23 ` Dominik Csapak [this message]
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=20211119152328.1866593-3-d.csapak@proxmox.com \
--to=d.csapak@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox