From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2 03/25] maintenance: add 'Unpplugged' maintenance type
Date: Thu, 21 Sep 2023 14:51:45 +0200 [thread overview]
Message-ID: <20230921125207.1301656-4-h.laimer@proxmox.com> (raw)
In-Reply-To: <20230921125207.1301656-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
pbs-api-types/src/maintenance.rs | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/pbs-api-types/src/maintenance.rs b/pbs-api-types/src/maintenance.rs
index 1b03ca94..caab9eb5 100644
--- a/pbs-api-types/src/maintenance.rs
+++ b/pbs-api-types/src/maintenance.rs
@@ -38,7 +38,6 @@ pub enum Operation {
/// Maintenance type.
pub enum MaintenanceType {
// TODO:
- // - Add "unmounting" once we got pluggable datastores
// - Add "GarbageCollection" or "DeleteOnly" as type and track GC (or all deletes) as separate
// operation, so that one can enable a mode where nothing new can be added but stuff can be
// cleaned
@@ -48,6 +47,8 @@ pub enum MaintenanceType {
Offline,
/// The datastore is being deleted.
Delete,
+ /// The removable datastore is unplugged
+ Unplugged,
}
serde_plain::derive_display_from_serialize!(MaintenanceType);
serde_plain::derive_fromstr_from_deserialize!(MaintenanceType);
@@ -82,6 +83,10 @@ impl MaintenanceMode {
bail!("datastore is being deleted");
}
+ if self.ty == MaintenanceType::Unplugged {
+ bail!("datastore is not plugged in");
+ }
+
let message = percent_encoding::percent_decode_str(self.message.as_deref().unwrap_or(""))
.decode_utf8()
.unwrap_or(Cow::Borrowed(""));
@@ -98,3 +103,27 @@ impl MaintenanceMode {
Ok(())
}
}
+
+#[test]
+fn test_check() {
+ let ro_mode = MaintenanceMode::new(MaintenanceType::ReadOnly, None);
+ let offline_mode = MaintenanceMode::new(MaintenanceType::Offline, None);
+ let delete_mode = MaintenanceMode::new(MaintenanceType::Delete, None);
+ let unplugged_mode = MaintenanceMode::new(MaintenanceType::Unplugged, None);
+
+ assert!(ro_mode.check(Some(Operation::Lookup)).is_ok());
+ assert!(ro_mode.check(Some(Operation::Read)).is_ok());
+ assert!(ro_mode.check(Some(Operation::Write)).is_err());
+
+ assert!(offline_mode.check(Some(Operation::Lookup)).is_ok());
+ assert!(offline_mode.check(Some(Operation::Read)).is_err());
+ assert!(offline_mode.check(Some(Operation::Write)).is_err());
+
+ assert!(delete_mode.check(Some(Operation::Lookup)).is_err());
+ assert!(delete_mode.check(Some(Operation::Read)).is_err());
+ assert!(delete_mode.check(Some(Operation::Write)).is_err());
+
+ assert!(unplugged_mode.check(Some(Operation::Lookup)).is_err());
+ assert!(unplugged_mode.check(Some(Operation::Read)).is_err());
+ assert!(unplugged_mode.check(Some(Operation::Write)).is_err());
+}
--
2.39.2
next prev parent reply other threads:[~2023-09-21 12:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-21 12:51 [pbs-devel] [PATCH proxmox-backup v2 00/25] add removable datastores Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 01/25] tools: add disks utility functions Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 02/25] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2023-09-21 12:51 ` Hannes Laimer [this message]
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 04/25] disks: add UUID to partition info Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 05/25] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 06/25] add helper for checking if a removable datastore is available Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 07/25] api2: removable datastore creation Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 08/25] ui: add partition selector form Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 09/25] api2: disks list: add only-unused flag Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 10/25] ui: add removable datastore creation support Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 11/25] ui: add (un)mount button to summary Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 12/25] pbs-api-types: datastore: use new proxmox_scheme::de for deserialization Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 13/25] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 14/25] ui: display removable datastores in list Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 15/25] ui: utils: render unplugged maintenance mode correctly Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 16/25] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 17/25] ui: add datastore status mask for unplugged removable datastores Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 18/25] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 19/25] ui: maintenance: disable edit if unplugged Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 20/25] pb-manager: add (un)mount command Hannes Laimer
2023-12-11 13:00 ` Gabriel Goller
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 21/25] add auto-mounting for removable datastores Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 22/25] api: mark removable datastores as unplugged after restart Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 23/25] datastore: handle deletion of removable datastore properly Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 24/25] docs: mention maintenance mode reset when removable datastore is unplugged Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 25/25] bump proxmox-schema dependency to 2.0.1 Hannes Laimer
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=20230921125207.1301656-4-h.laimer@proxmox.com \
--to=h.laimer@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