file restore: rename dynamic-memory to auto-memory-hotplug

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

proxmox-file-restore/src/block_driver.rs

@@ -43,7 +43,7 @@ pub trait BlockRestoreDriver {
         details: SnapRestoreDetails,
         img_file: String,
         path: Vec<u8>,
-        dynamic_memory: bool,
+        auto_memory_hotplug: bool,
     ) -> Async<Result<Vec<ArchiveEntry>, Error>>;
 
     /// pxar=true:
@@ -58,7 +58,7 @@ pub trait BlockRestoreDriver {
         path: Vec<u8>,
         format: Option<FileRestoreFormat>,
         zstd: bool,
-        dynamic_memory: bool,
+        auto_memory_hotplug: bool,
     ) -> Async<Result<Box<dyn tokio::io::AsyncRead + Unpin + Send>, Error>>;
 
     /// Return status of all running/mapped images, result value is (id, extra data), where id must
@@ -94,11 +94,11 @@ pub async fn data_list(
     details: SnapRestoreDetails,
     img_file: String,
     path: Vec<u8>,
-    dynamic_memory: bool,
+    auto_memory_hotplug: bool,
 ) -> Result<Vec<ArchiveEntry>, Error> {
     let driver = driver.unwrap_or(DEFAULT_DRIVER).resolve();
     driver
-        .data_list(details, img_file, path, dynamic_memory)
+        .data_list(details, img_file, path, auto_memory_hotplug)
         .await
 }
 
@@ -109,11 +109,11 @@ pub async fn data_extract(
     path: Vec<u8>,
     format: Option<FileRestoreFormat>,
     zstd: bool,
-    dynamic_memory: bool,
+    auto_memory_hotplug: bool,
 ) -> Result<Box<dyn tokio::io::AsyncRead + Send + Unpin>, Error> {
     let driver = driver.unwrap_or(DEFAULT_DRIVER).resolve();
     driver
-        .data_extract(details, img_file, path, format, zstd, dynamic_memory)
+        .data_extract(details, img_file, path, format, zstd, auto_memory_hotplug)
         .await
 }
 

proxmox-file-restore/src/block_driver_qemu.rs

@@ -19,7 +19,7 @@ use pbs_datastore::catalog::ArchiveEntry;
 
 use super::block_driver::*;
 use crate::get_user_run_dir;
-use crate::qemu_helper::set_dynamic_memory;
+use crate::qemu_helper::set_auto_memory_hotplug;
 
 const RESTORE_VM_MAP: &str = "restore-vm-map.json";
 
@@ -218,15 +218,15 @@ impl BlockRestoreDriver for QemuBlockDriver {
         details: SnapRestoreDetails,
         img_file: String,
         mut path: Vec<u8>,
-        dynamic_memory: bool,
+        auto_memory_hotplug: bool,
     ) -> Async<Result<Vec<ArchiveEntry>, Error>> {
         async move {
             let (cid, client) = ensure_running(&details).await?;
             if !path.is_empty() && path[0] != b'/' {
                 path.insert(0, b'/');
             }
-            if path_is_zfs(&path) && dynamic_memory {
+            if path_is_zfs(&path) && auto_memory_hotplug {
-                if let Err(err) = set_dynamic_memory(cid, None).await {
+                if let Err(err) = set_auto_memory_hotplug(cid, None).await {
                     log::error!("could not increase memory: {err}");
                 }
             }
@@ -246,15 +246,15 @@ impl BlockRestoreDriver for QemuBlockDriver {
         mut path: Vec<u8>,
         format: Option<FileRestoreFormat>,
         zstd: bool,
-        dynamic_memory: bool,
+        auto_memory_hotplug: bool,
     ) -> Async<Result<Box<dyn tokio::io::AsyncRead + Unpin + Send>, Error>> {
         async move {
             let (cid, client) = ensure_running(&details).await?;
             if !path.is_empty() && path[0] != b'/' {
                 path.insert(0, b'/');
             }
-            if path_is_zfs(&path) && dynamic_memory {
+            if path_is_zfs(&path) && auto_memory_hotplug {
-                if let Err(err) = set_dynamic_memory(cid, None).await {
+                if let Err(err) = set_auto_memory_hotplug(cid, None).await {
                     log::error!("could not increase memory: {err}");
                 }
             }

proxmox-file-restore/src/main.rs

@@ -105,7 +105,7 @@ async fn list_files(
     crypt_config: Option<Arc<CryptConfig>>,
     keyfile: Option<String>,
     driver: Option<BlockDriverType>,
-    dynamic_memory: bool,
+    auto_memory_hotplug: bool,
 ) -> Result<Vec<ArchiveEntry>, Error> {
     let client = connect(&repo)?;
     let client = BackupReader::start(
@@ -172,7 +172,7 @@ async fn list_files(
                 snapshot,
                 keyfile,
             };
-            data_list(driver, details, file, path, dynamic_memory).await
+            data_list(driver, details, file, path, auto_memory_hotplug).await
         }
     }
 }
@@ -228,9 +228,9 @@ async fn list_files(
                 minimum: 1,
                 optional: true,
             },
-            "dynamic-memory": {
+            "auto-memory-hotplug": {
                 type: Boolean,
-                description: "If enabled, automatically increases memory for started vms in case of accessing a zpool inside.",
+                description: "If enabled, automatically hot-plugs memory for started VM if a ZFS pool is accessed.",
                 default: false,
                 optional: true,
             },
@@ -251,7 +251,7 @@ async fn list(
     path: String,
     base64: bool,
     timeout: Option<u64>,
-    dynamic_memory: bool,
+    auto_memory_hotplug: bool,
     param: Value,
 ) -> Result<(), Error> {
     let repo = extract_repository_from_value(&param)?;
@@ -289,7 +289,7 @@ async fn list(
                 crypt_config,
                 keyfile,
                 driver,
-                dynamic_memory,
+                auto_memory_hotplug,
             ),
         )
         .await
@@ -306,7 +306,7 @@ async fn list(
             crypt_config,
             keyfile,
             driver,
-            dynamic_memory,
+            auto_memory_hotplug,
         )
         .await
     };
@@ -415,9 +415,9 @@ async fn list(
                 type: BlockDriverType,
                 optional: true,
             },
-            "dynamic-memory": {
+            "auto-memory-hotplug": {
                 type: Boolean,
-                description: "If enabled, automatically increases memory for started vms in case of accessing a zpool inside.",
+                description: "If enabled, automatically hot-plugs memory for started VM if a ZFS pool is accessed.",
                 default: false,
                 optional: true,
             },
@@ -434,7 +434,7 @@ async fn extract(
     target: Option<String>,
     format: Option<FileRestoreFormat>,
     zstd: bool,
-    dynamic_memory: bool,
+    auto_memory_hotplug: bool,
     param: Value,
 ) -> Result<(), Error> {
     let repo = extract_repository_from_value(&param)?;
@@ -516,7 +516,7 @@ async fn extract(
                     path.clone(),
                     Some(FileRestoreFormat::Pxar),
                     false,
-                    dynamic_memory,
+                    auto_memory_hotplug,
                 )
                 .await?;
                 let decoder = Decoder::from_tokio(reader).await?;
@@ -536,7 +536,7 @@ async fn extract(
                     path.clone(),
                     format,
                     zstd,
-                    dynamic_memory,
+                    auto_memory_hotplug,
                 )
                 .await?;
                 tokio::io::copy(&mut reader, &mut tokio::io::stdout()).await?;