From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 7CB091FF380 for ; Fri, 19 Apr 2024 09:38:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BAEA2A7A; Fri, 19 Apr 2024 09:38:24 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Fri, 19 Apr 2024 09:37:50 +0200 Message-Id: <20240419073750.135595-4-dietmar@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419073750.135595-1-dietmar@proxmox.com> References: <20240419073750.135595-1-dietmar@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.549 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pbs-devel] [PATCH proxmox-backup v2 3/3] pbs-api-types: add check for allowed maintenmance mode changes 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" Signed-off-by: Dietmar Maurer --- pbs-api-types/src/datastore.rs | 34 ++++++++++++++++++++++++++++++++++ pbs-datastore/src/datastore.rs | 8 ++++++-- src/api2/config/datastore.rs | 13 ++++++++++--- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs index 483cdef4..9fe45bc0 100644 --- a/pbs-api-types/src/datastore.rs +++ b/pbs-api-types/src/datastore.rs @@ -344,6 +344,40 @@ impl DataStoreConfig { .ok() }) } + + pub fn set_maintenance_mode(&mut self, new_mode: Option) -> Result<(), Error> { + 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 { + Some(MaintenanceType::ReadOnly) => { /* always OK */ } + Some(MaintenanceType::Offline) => { /* always OK */ } + Some(MaintenanceType::Unmount) => { + bail!("datastore is being unmounted"); + } + Some(MaintenanceType::Delete) => { + match new_type { + Some(MaintenanceType::Delete) => { /* allow to delete a deleted storage */ } + _ => { + bail!("datastore is being deleted") + } + } + } + None => { /* always OK */ } + } + + let new_mode = match new_mode { + Some(new_mode) => Some( + proxmox_schema::property_string::PropertyString::new(new_mode) + .to_property_string()?, + ), + None => None, + }; + + self.maintenance_mode = new_mode; + + Ok(()) + } } #[api( diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 0685cc84..f95da761 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -20,7 +20,7 @@ use proxmox_sys::{task_log, task_warn}; use pbs_api_types::{ Authid, BackupNamespace, BackupType, ChunkOrder, DataStoreConfig, DatastoreFSyncLevel, - DatastoreTuning, GarbageCollectionStatus, Operation, UPID, + DatastoreTuning, GarbageCollectionStatus, MaintenanceMode, MaintenanceType, Operation, UPID, }; use crate::backup_info::{BackupDir, BackupGroup, BackupGroupDeleteStats}; @@ -1390,7 +1390,11 @@ impl DataStore { let (mut config, _digest) = pbs_config::datastore::config()?; let mut datastore_config: DataStoreConfig = config.lookup("datastore", name)?; - datastore_config.maintenance_mode = Some("type=delete".to_string()); + datastore_config.set_maintenance_mode(Some(MaintenanceMode { + ty: MaintenanceType::Delete, + message: None, + }))?; + config.set_data(name, "datastore", &datastore_config)?; pbs_config::datastore::save_config(&config)?; drop(config_lock); diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index 3081e1f4..87425ff5 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -13,7 +13,7 @@ use proxmox_uuid::Uuid; use pbs_api_types::{ Authid, DataStoreConfig, DataStoreConfigUpdater, DatastoreNotify, DatastoreTuning, KeepOptions, - PruneJobConfig, PruneJobOptions, DATASTORE_SCHEMA, PRIV_DATASTORE_ALLOCATE, + MaintenanceMode, PruneJobConfig, PruneJobOptions, DATASTORE_SCHEMA, PRIV_DATASTORE_ALLOCATE, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_MODIFY, PROXMOX_CONFIG_DIGEST_SCHEMA, UPID_SCHEMA, }; use pbs_config::BackupLockGuard; @@ -319,7 +319,7 @@ pub fn update_datastore( data.tuning = None; } DeletableProperty::MaintenanceMode => { - data.maintenance_mode = None; + data.set_maintenance_mode(None)?; } } } @@ -392,7 +392,14 @@ pub fn update_datastore( let mut maintenance_mode_changed = false; if update.maintenance_mode.is_some() { maintenance_mode_changed = data.maintenance_mode != update.maintenance_mode; - data.maintenance_mode = update.maintenance_mode; + + let maintenance_mode = match update.maintenance_mode { + Some(mode_str) => Some(MaintenanceMode::deserialize( + proxmox_schema::de::SchemaDeserializer::new(mode_str, &MaintenanceMode::API_SCHEMA), + )?), + None => None, + }; + data.set_maintenance_mode(maintenance_mode)?; } config.set_data(&name, "datastore", &data)?; -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel