From: Christian Ebner <c.ebner@proxmox.com>
To: Robert Obkircher <r.obkircher@proxmox.com>, pbs-devel@lists.proxmox.com
Subject: Re: [PATCH proxmox 1/5] pbs-api-types: propagate maintenance mode parse errors
Date: Wed, 3 Jun 2026 12:33:39 +0200 [thread overview]
Message-ID: <7700e71b-9cb1-47b2-a78f-96c98259bb3b@proxmox.com> (raw)
In-Reply-To: <20260602130001.217482-2-r.obkircher@proxmox.com>
a few minor comments only
On 6/2/26 3:00 PM, Robert Obkircher wrote:
> Do not silently ignore errors if the config file is invalid or
> contains a new mode from a future version.
The commit message should also include an explicit statement that
set_maintenance_mode() now fails when mode cannot be parsed and that
this does not interfere with the current behavior when `enum-fallback`
is enabled.
> Upgrades to the new GarbageCollection maintenance mode should be fine
> even without this change, becausue it is unlikely that someone can
> enable it before older processes stop initiating new backups or S3
> refreshes. There is however a risk that a sync job could unmount the
> datastore.
>
> Signed-off-by: Robert Obkircher <r.obkircher@proxmox.com>
> ---
> pbs-api-types/src/datastore.rs | 22 +++++++++++++---------
> 1 file changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
> index 7643b0de..b770bc03 100644
> --- a/pbs-api-types/src/datastore.rs
> +++ b/pbs-api-types/src/datastore.rs
> @@ -629,18 +629,22 @@ impl DataStoreConfig {
> }
> }
>
> - pub fn get_maintenance_mode(&self) -> Option<MaintenanceMode> {
> - self.maintenance_mode.as_ref().and_then(|str| {
> - MaintenanceMode::deserialize(proxmox_schema::de::SchemaDeserializer::new(
> - str,
> - &MaintenanceMode::API_SCHEMA,
> - ))
> - .ok()
> - })
> + pub fn get_maintenance_mode(&self) -> Result<Option<MaintenanceMode>, Error> {
> + self.maintenance_mode
> + .as_ref()
> + .map(|str| {
> + MaintenanceMode::deserialize(proxmox_schema::de::SchemaDeserializer::new(
> + str,
> + &MaintenanceMode::API_SCHEMA,
> + ))
> + .map_err(|e| format_err!("failed to parse maintenance mode: {e}"))
> + })
> + .transpose()
> }
>
> pub fn set_maintenance_mode(&mut self, new_mode: Option<MaintenanceMode>) -> Result<(), Error> {
> - let current_type = self.get_maintenance_mode().map(|mode| mode.ty);
> + // it is probably best to error out if the current mode can't be parsed:
This comment would benefit from including a bit more reasoning:
e.g. never allow setting of maintenance mode on parsing errors for
current mode, possible new maintenance type variant.
> + let current_type = self.get_maintenance_mode()?.map(|mode| mode.ty);
> let new_type = new_mode.as_ref().map(|mode| mode.ty);
>
> match current_type {
Slightly unrelated, but since noted during review and and this fits to
the patch series: the docstrings for `ty` in MaintenanceMode and
`maintenance_mode` in DataStoreConfig are outdated and need to be updated.
With that addressed:
Reviewed-by: Christian Ebner <c.ebner@proxmox.com>
next prev parent reply other threads:[~2026-06-03 10:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-02 12:58 [PATCH proxmox{,-backup} 00/11] add GarbageCollection maintenance mode Robert Obkircher
2026-06-02 12:58 ` [PATCH proxmox 1/5] pbs-api-types: propagate maintenance mode parse errors Robert Obkircher
2026-06-03 10:33 ` Christian Ebner [this message]
2026-06-02 12:58 ` [PATCH proxmox 2/5] pbs-api-types: use match statement for maintenance mode check Robert Obkircher
2026-06-03 10:36 ` Christian Ebner
2026-06-03 11:04 ` Robert Obkircher
2026-06-03 11:30 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 3/5] pbs-api-types: deny non-lookup operations for unknown modes Robert Obkircher
2026-06-03 10:38 ` Christian Ebner
2026-06-03 11:18 ` Robert Obkircher
2026-06-03 11:38 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 4/5] pbs-api-types: add WriteNonExpanding datastore operation Robert Obkircher
2026-06-03 10:45 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 5/5] pbs-api-types: add GarbageCollection maintenance mode Robert Obkircher
2026-06-03 10:50 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox-backup 1/6] datastore: propagate maintenance mode parse errors Robert Obkircher
2026-06-03 11:20 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox-backup 2/6] task tracking: use parameter for initial count and refactor updates Robert Obkircher
2026-06-03 11:58 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox-backup 3/6] www: access active operation fields by name instead of index Robert Obkircher
2026-06-03 12:04 ` Christian Ebner
2026-06-02 12:59 ` [PATCH proxmox-backup 4/6] task tracking: count WriteNonExpanding datastore operations Robert Obkircher
2026-06-03 12:18 ` Christian Ebner
2026-06-02 12:59 ` [PATCH proxmox-backup 5/6] datastore: open datastores with WriteNonExpanding instead of Write Robert Obkircher
2026-06-03 12:28 ` Christian Ebner
2026-06-02 12:59 ` [PATCH proxmox-backup 6/6] fix #5797: www: display new GarbageCollection maintenance mode Robert Obkircher
2026-06-03 13:03 ` Christian Ebner
2026-06-03 13:28 ` [PATCH proxmox{,-backup} 00/11] add " Christian Ebner
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=7700e71b-9cb1-47b2-a78f-96c98259bb3b@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
--cc=r.obkircher@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