Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-08-04 08:21:54 +03:00
Code Releases Activity

restore: guard HA config module usage for checking if VM is HA managed

Browse Source 
can make bootstrapping easier as pve-ha-manager also depends on
qemu-server, while that probably should be solved by adding a common
base for HA utils/config its much less work doing this as stop-gap for
now.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2025-06-17 12:36:11 +02:00
parent ee08cd188d
commit b70372f67e
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/PVE/QemuServer.pm
View File

@ -32,7 +32,6 @@ use PVE::DataCenterConfig;
use PVE::Exception qw(raise raise_param_exc);
use PVE::Format qw(render_duration render_bytes);
use PVE::GuestHelpers qw(safe_string_ne safe_num_ne safe_boolean_ne);
use PVE::HA::Config;
use PVE::Mapping::Dir;
use PVE::Mapping::PCI;
use PVE::Mapping::USB;
@ -76,6 +75,18 @@ eval {
$have_sdn = 1;
};
my $have_ha_config;
eval {
require PVE::HA::Config;
$have_ha_config = 1;
};
my sub vm_is_ha_managed {
my ($vmid) = @_;
die "cannot check if VM is managed by HA, missing HA Config module!\n" if !$have_ha_config;
return PVE::HA::Config::vm_is_ha_managed($vmid);
}
my $EDK2_FW_BASE = '/usr/share/pve-edk2-firmware/';
my $OVMF = {
x86_64 => {
@ -7850,7 +7861,7 @@ sub pbs_live_restore {
my $drives_streamed = 0;
eval {
# make sure HA doesn't interrupt our restore by stopping the VM
if (PVE::HA::Config::vm_is_ha_managed($vmid)) {
if (vm_is_ha_managed($vmid)) {
run_command(['ha-manager', 'set', "vm:$vmid", '--state', 'started']);
}
@ -7949,7 +7960,7 @@ sub live_import_from_files {
eval {
# make sure HA doesn't interrupt our restore by stopping the VM
if (PVE::HA::Config::vm_is_ha_managed($vmid)) {
if (vm_is_ha_managed($vmid)) {
run_command(['ha-manager', 'set', "vm:$vmid", '--state', 'started']);
}