[PATCH proxmox-backup v4 13/14] api: datastore: move prune job and s3 backend logic to create helper

[Christian Ebner <c.ebner@proxmox.com>]

Moving the logic to the common datastore create helper will facilitate
switching to the datastore create maintenance mode in following changes.

The same logic can be used for the directory/zfs datastore creation, as
prune job creation and s3 backend logic can be skipped there.

No functional changes intended.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 src/api2/config/datastore.rs     | 28 ++++++++++++++++++----------
 src/api2/node/disks/directory.rs | 15 +++++++++++----
 src/api2/node/disks/zfs.rs       | 17 ++++++++++++-----
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index 7505e8c78..5d0aa966a 100644
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -9,6 +9,7 @@ use proxmox_router::{Permission, Router, RpcEnvironment, RpcEnvironmentType, htt
 use proxmox_schema::{ApiType, api, param_bail};
 use proxmox_section_config::SectionConfigData;
 use proxmox_uuid::Uuid;
+use proxmox_worker_task::WorkerTaskContext;
 
 use pbs_api_types::{
     Authid, DATASTORE_SCHEMA, DataStoreConfig, DataStoreConfigUpdater, DatastoreBackendType,
@@ -95,7 +96,10 @@ impl Drop for UnmountGuard {
 pub(crate) fn do_create_datastore(
     lock: BackupLockGuard,
     mut config: SectionConfigData,
+    worker: &dyn WorkerTaskContext,
+    backend_type: DatastoreBackendType,
     mut datastore: DataStoreConfig,
+    prune_job_config: Option<PruneJobConfig>,
     reuse_datastore: bool,
     overwrite_in_use: bool,
 ) -> Result<(), Error> {
@@ -118,6 +122,16 @@ pub(crate) fn do_create_datastore(
 
     unmount_guard.disable();
 
+    drop(lock);
+
+    if let Some(prune_job_config) = prune_job_config {
+        do_create_prune_job(prune_job_config)?;
+    }
+
+    if reuse_datastore && backend_type == DatastoreBackendType::S3 {
+        crate::api2::admin::datastore::do_s3_refresh(&datastore.name, worker)?;
+    }
+
     Ok(())
 }
 
@@ -214,19 +228,13 @@ pub fn create_datastore(
             do_create_datastore(
                 lock,
                 section_config,
+                &worker,
+                backend,
                 config,
+                prune_job_config,
                 reuse_datastore,
                 overwrite_in_use,
-            )?;
-
-            if let Some(prune_job_config) = prune_job_config {
-                do_create_prune_job(prune_job_config)?;
-            }
-
-            if reuse_datastore && backend == DatastoreBackendType::S3 {
-                crate::api2::admin::datastore::do_s3_refresh(&store_name, &worker)?;
-            }
-            Ok(())
+            )
         },
     )
 }
diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs
index 9979355e5..7fc7187bf 100644
--- a/src/api2/node/disks/directory.rs
+++ b/src/api2/node/disks/directory.rs
@@ -11,8 +11,8 @@ use proxmox_schema::api;
 use proxmox_section_config::SectionConfigData;
 
 use pbs_api_types::{
-    BLOCKDEVICE_NAME_SCHEMA, DATASTORE_MOUNT_DIR, DATASTORE_SCHEMA, DataStoreConfig, NODE_SCHEMA,
-    PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA,
+    BLOCKDEVICE_NAME_SCHEMA, DATASTORE_MOUNT_DIR, DATASTORE_SCHEMA, DataStoreConfig,
+    DatastoreBackendType, NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA,
 };
 
 use crate::tools::disks::{
@@ -214,7 +214,7 @@ pub fn create_datastore_disk(
         Some(name.clone()),
         auth_id,
         to_stdout,
-        move |_worker| {
+        move |worker| {
             info!("create datastore '{name}' on disk {disk}");
 
             let filesystem = filesystem.unwrap_or(FileSystemType::Ext4);
@@ -251,7 +251,14 @@ pub fn create_datastore_disk(
                 pbs_config::datastore::validate_new_datastore_config(&datastore, &config, &lock)?;
 
                 crate::api2::config::datastore::do_create_datastore(
-                    lock, config, datastore, false, false,
+                    lock,
+                    config,
+                    &worker,
+                    DatastoreBackendType::Filesystem,
+                    datastore,
+                    None,
+                    false,
+                    false,
                 )?;
             }
 
diff --git a/src/api2/node/disks/zfs.rs b/src/api2/node/disks/zfs.rs
index 0e8ce75b5..2a44c3d2d 100644
--- a/src/api2/node/disks/zfs.rs
+++ b/src/api2/node/disks/zfs.rs
@@ -6,9 +6,9 @@ use proxmox_router::{Permission, Router, RpcEnvironment, RpcEnvironmentType};
 use proxmox_schema::api;
 
 use pbs_api_types::{
-    DATASTORE_SCHEMA, DISK_ARRAY_SCHEMA, DISK_LIST_SCHEMA, DataStoreConfig, NODE_SCHEMA,
-    PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA, ZFS_ASHIFT_SCHEMA, ZPOOL_NAME_SCHEMA,
-    ZfsCompressionType, ZfsRaidLevel, ZpoolListItem,
+    DATASTORE_SCHEMA, DISK_ARRAY_SCHEMA, DISK_LIST_SCHEMA, DataStoreConfig, DatastoreBackendType,
+    NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA, ZFS_ASHIFT_SCHEMA,
+    ZPOOL_NAME_SCHEMA, ZfsCompressionType, ZfsRaidLevel, ZpoolListItem,
 };
 
 use crate::tools::disks::{
@@ -228,7 +228,7 @@ pub fn create_zpool(
         Some(name.clone()),
         auth_id,
         to_stdout,
-        move |_worker| {
+        move |worker| {
             info!("create {raidlevel:?} zpool '{name}' on devices '{devices_text}'");
 
             let mut command = std::process::Command::new("zpool");
@@ -311,7 +311,14 @@ pub fn create_zpool(
                 pbs_config::datastore::validate_new_datastore_config(&datastore, &config, &lock)?;
 
                 crate::api2::config::datastore::do_create_datastore(
-                    lock, config, datastore, false, false,
+                    lock,
+                    config,
+                    &worker,
+                    DatastoreBackendType::Filesystem,
+                    datastore,
+                    None,
+                    false,
+                    false,
                 )?;
             }
 
-- 
2.47.3