From: Christian Ebner <c.ebner@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Dietmar Maurer <dietmar@proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup v2 1/3] pbs-api-types: use SchemaDeserializer for maintenance mode
Date: Fri, 19 Apr 2024 11:42:12 +0200 [thread overview]
Message-ID: <8c3ec95b-cce9-47f1-81e9-7010a8aa7c55@proxmox.com> (raw)
In-Reply-To: <20240419073750.135595-2-dietmar@proxmox.com>
On 4/19/24 09:37, Dietmar Maurer wrote:
> Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
> pbs-api-types/src/datastore.rs | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
> index 5e13c157..483cdef4 100644
> --- a/pbs-api-types/src/datastore.rs
> +++ b/pbs-api-types/src/datastore.rs
> @@ -11,8 +11,8 @@ use proxmox_schema::{
> };
>
> use crate::{
> - Authid, CryptMode, Fingerprint, GroupFilter, MaintenanceMode, Userid, BACKUP_ID_RE,
> - BACKUP_NS_RE, BACKUP_TIME_RE, BACKUP_TYPE_RE, DATASTORE_NOTIFY_STRING_SCHEMA,
> + Authid, CryptMode, Fingerprint, GroupFilter, MaintenanceMode, MaintenanceType, Userid,
> + BACKUP_ID_RE, BACKUP_NS_RE, BACKUP_TIME_RE, BACKUP_TYPE_RE, DATASTORE_NOTIFY_STRING_SCHEMA,
> GC_SCHEDULE_SCHEMA, GROUP_OR_SNAPSHOT_PATH_REGEX_STR, PROXMOX_SAFE_ID_FORMAT,
> PROXMOX_SAFE_ID_REGEX_STR, PRUNE_SCHEDULE_SCHEMA, SHA256_HEX_REGEX, SINGLE_LINE_COMMENT_SCHEMA,
> SNAPSHOT_PATH_REGEX_STR, UPID,
> @@ -336,10 +336,13 @@ impl DataStoreConfig {
> }
>
> pub fn get_maintenance_mode(&self) -> Option<MaintenanceMode> {
> - self.maintenance_mode
> - .as_ref()
> - .and_then(|str| MaintenanceMode::API_SCHEMA.parse_property_string(str).ok())
> - .and_then(|value| MaintenanceMode::deserialize(value).ok())
> + self.maintenance_mode.as_ref().and_then(|str| {
> + MaintenanceMode::deserialize(proxmox_schema::de::SchemaDeserializer::new(
Should `SchemaDeserializer` be brought into scope by adding it to the
already present `proxmox_schema` use statement?
> + str,
> + &MaintenanceMode::API_SCHEMA,
> + ))
> + .ok()
> + })
> }
> }
>
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-04-19 9:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 7:37 [pbs-devel] [PATCH proxmox-backup v2 0/3] pbs-api-types: new MaintenanceType::Unmount, implement and use set_maintenance_mode Dietmar Maurer
2024-04-19 7:37 ` [pbs-devel] [PATCH proxmox-backup v2 1/3] pbs-api-types: use SchemaDeserializer for maintenance mode Dietmar Maurer
2024-04-19 9:42 ` Christian Ebner [this message]
2024-04-19 7:37 ` [pbs-devel] [PATCH proxmox-backup v2 2/3] maintenance: add 'Unmount' maintenance type Dietmar Maurer
2024-04-19 7:37 ` [pbs-devel] [PATCH proxmox-backup v2 3/3] pbs-api-types: add check for allowed maintenmance mode changes Dietmar Maurer
2024-04-22 7:20 ` Thomas Lamprecht
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=8c3ec95b-cce9-47f1-81e9-7010a8aa7c55@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=dietmar@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