proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-04-29 20:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

file restore: allow to pass dimm size via env

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-11-14 16:07:10 +01:00
parent 0f2f523aa6
commit 2f0f3e9979
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
proxmox-file-restore/src/block_driver_qemu.rs
View File

@ -19,7 +19,7 @@ use pbs_datastore::catalog::ArchiveEntry;
use super::block_driver::*; use super::block_driver::*;
use crate::get_user_run_dir; use crate::get_user_run_dir;
use crate::qemu_helper; use crate::qemu_helper::{self, MAX_MEMORY_DIMM_SIZE};
const RESTORE_VM_MAP: &str = "restore-vm-map.json"; const RESTORE_VM_MAP: &str = "restore-vm-map.json";
@ -204,9 +204,17 @@ async fn handle_extra_guest_memory_needs(cid: i32, path: &[u8]) {
Some("true") => (), Some("true") => (),
_ => return, // this is opt-in _ => return, // this is opt-in
} }
let size = match var("PBS_FILE_RESTORE_MEM_HOTPLUG_SIZE_MB").map(|v| v.parse::<usize>()) {
Ok(Ok(size)) if size > MAX_MEMORY_DIMM_SIZE => {
log::warn!("limit memory request of {size} to {MAX_MEMORY_DIMM_SIZE}");
MAX_MEMORY_DIMM_SIZE
}
Ok(Ok(size)) => size,
_ => 256, // in practice this means a total of ~ 512 MB depending on disk count
};
if path_is_zfs(path) { if path_is_zfs(path) {
if let Err(err) = qemu_helper::set_dynamic_memory(cid, None).await { if let Err(err) = qemu_helper::hotplug_memory(cid, size).await {
log::error!("could not increase memory: {err}"); log::error!("could not increase memory: {err}");
} }
} }

12
proxmox-file-restore/src/qemu_helper.rs
View File

@ -135,14 +135,10 @@ async fn send_qmp_request<T: AsyncBufRead + AsyncWrite + Unpin>(
Ok(buf) Ok(buf)
} }
pub async fn set_dynamic_memory(cid: i32, target_memory: Option<usize>) -> Result<(), Error> { pub(crate) async fn hotplug_memory(cid: i32, dimm_mb: usize) -> Result<(), Error> {
let target_memory = match target_memory { if dimm_mb > MAX_MEMORY_DIMM_SIZE {
Some(size) if size > MAX_MEMORY_DIMM_SIZE => { bail!("cannot set to {dimm_mb}M, maximum is {MAX_MEMORY_DIMM_SIZE}M");
bail!("cannot set to {size}M, maximum is {DYNAMIC_MEMORY_MB}M")
} }
Some(size) => size,
None => MAX_MEMORY_DIMM_SIZE,
};
let path = format!("{QMP_SOCKET_PREFIX}{cid}.sock"); let path = format!("{QMP_SOCKET_PREFIX}{cid}.sock");
let mut stream = tokio::io::BufStream::new(tokio::net::UnixStream::connect(path).await?); let mut stream = tokio::io::BufStream::new(tokio::net::UnixStream::connect(path).await?);
@ -155,7 +151,7 @@ pub async fn set_dynamic_memory(cid: i32, target_memory: Option<usize>) -> Resul
"arguments": { "arguments": {
"qom-type": "memory-backend-ram", "qom-type": "memory-backend-ram",
"id": "mem0", "id": "mem0",
"size": target_memory * 1024 * 1024, "size": dimm_mb * 1024 * 1024,
} }
}); });
let _ = send_qmp_request(&mut stream, &serde_json::to_string(&request)?).await?; let _ = send_qmp_request(&mut stream, &serde_json::to_string(&request)?).await?;