[pbs-devel] [PATCH proxmox-backup 0/2] maintenance mode followups

[pbs-devel] [PATCH proxmox-backup 0/2] maintenance mode followups

[Dominik Csapak]

two small followups if we want to apply the current state of the
maintenance mode[0] (i just got to part 3/6 in my review today)

0: https://lists.proxmox.com/pipermail/pbs-devel/2021-November/004295.html

Dominik Csapak (2):
  api: tape: fix datastore lookup operations
  datastore: improve error on maintenance mode failure with empty
    message

 pbs-datastore/src/datastore.rs | 6 +++++-
 src/api2/tape/backup.rs        | 4 ++--
 src/api2/tape/restore.rs       | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 1/2] api: tape: fix datastore lookup operations

[Dominik Csapak]

restore needs write access, and backup only read access

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/api2/tape/backup.rs  | 4 ++--
 src/api2/tape/restore.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api2/tape/backup.rs b/src/api2/tape/backup.rs
index a006aa87..b374de25 100644
--- a/src/api2/tape/backup.rs
+++ b/src/api2/tape/backup.rs
@@ -168,7 +168,7 @@ pub fn do_tape_backup_job(
 
     let worker_type = job.jobtype().to_string();
 
-    let datastore = DataStore::lookup_datastore(&setup.store, Some(Operation::Write))?;
+    let datastore = DataStore::lookup_datastore(&setup.store, Some(Operation::Read))?;
 
     let (config, _digest) = pbs_config::media_pool::config()?;
     let pool_config: MediaPoolConfig = config.lookup("pool", &setup.pool)?;
@@ -349,7 +349,7 @@ pub fn backup(
         &setup.drive,
     )?;
 
-    let datastore = DataStore::lookup_datastore(&setup.store, Some(Operation::Write))?;
+    let datastore = DataStore::lookup_datastore(&setup.store, Some(Operation::Read))?;
 
     let (config, _digest) = pbs_config::media_pool::config()?;
     let pool_config: MediaPoolConfig = config.lookup("pool", &setup.pool)?;
diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs
index f821b3e5..10bb9003 100644
--- a/src/api2/tape/restore.rs
+++ b/src/api2/tape/restore.rs
@@ -93,10 +93,10 @@ impl TryFrom<String> for DataStoreMap {
             if let Some(index) = store.find('=') {
                 let mut target = store.split_off(index);
                 target.remove(0); // remove '='
-                let datastore = DataStore::lookup_datastore(&target, Some(Operation::Read))?;
+                let datastore = DataStore::lookup_datastore(&target, Some(Operation::Write))?;
                 map.insert(store, datastore);
             } else if default.is_none() {
-                default = Some(DataStore::lookup_datastore(&store, Some(Operation::Read))?);
+                default = Some(DataStore::lookup_datastore(&store, Some(Operation::Write))?);
             } else {
                 bail!("multiple default stores given");
             }
-- 
2.30.2

[pbs-devel] [PATCH proxmox-backup 2/2] datastore: improve error on maintenance mode failure with empty message

[Dominik Csapak]

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