proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-14 12:30:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup update_vm - carefully reload config after changes

Browse Source 
Split out code to delete drive into delete_drive()

Always hotplug after config is written and reloaded.

Do not revert config if hotplug fails.

Do not safe config in add_unused_volume.
This commit is contained in:
Dietmar Maurer 2012-02-02 10:41:08 +01:00
parent 1e68cb191a
commit 5d7a6767be
2 changed files with 80 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
PVE/API2/Qemu.pm
View File

@ -58,7 +58,7 @@ my $check_volume_access = sub {
# Note: $pool is only needed when creating a VM, because pool permissions # Note: $pool is only needed when creating a VM, because pool permissions
# are automatically inherited if VM already exists inside a pool. # are automatically inherited if VM already exists inside a pool.
my $create_disks = sub { my $create_disks = sub {
my ($rpcenv, $authuser, $storecfg, $vmid, $pool, $settings, $conf, $default_storage) = @_; my ($rpcenv, $authuser, $storecfg, $vmid, $pool, $settings, $default_storage) = @_;
# check permissions first # check permissions first
@ -545,6 +545,33 @@ __PACKAGE__->register_method({
return $conf; return $conf;
}}); }});
my $delete_drive = sub {
my ($conf, $storecfg, $vmid, $drive, $force) = @_;
my $changes = {};
if (!PVE::QemuServer::drive_is_cdrom($drive)) {
my $volid = $drive->{file};
if ($volid !~ m|^/|) {
my ($path, $owner);
eval { ($path, $owner) = PVE::Storage::path($storecfg, $volid); };
if ($owner && ($owner == $vmid)) {
if ($force) {
eval { PVE::Storage::vdisk_free($storecfg, $volid); };
warn $@ if $@;
} else {
PVE::QemuServer::add_unused_volume($conf, $volid, $vmid, $changes);
}
}
}
} else {
}
return $changes;
};
my $vm_config_perm_list = [ my $vm_config_perm_list = [
'VM.Config.Disk', 'VM.Config.Disk',
'VM.Config.CDROM', 'VM.Config.CDROM',
@ -668,8 +695,7 @@ __PACKAGE__->register_method({
PVE::Cluster::log_msg('info', $authuser, "update VM $vmid: " . join (' ', @paramarr)); PVE::Cluster::log_msg('info', $authuser, "update VM $vmid: " . join (' ', @paramarr));
#delete foreach my $opt (@delete) { # delete
foreach my $opt (@delete) {
$conf = PVE::QemuServer::load_config($vmid); # update/reload $conf = PVE::QemuServer::load_config($vmid); # update/reload
@ -677,80 +703,66 @@ __PACKAGE__->register_method({
die "error hot-unplug $opt" if !PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt); die "error hot-unplug $opt" if !PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
#drive my $changes = {};
if (my $drive = $drive_hash->{$opt}) {
#hdd if (my $drive = $drive_hash->{$opt}) { # drives
if (!PVE::QemuServer::drive_is_cdrom($drive)) { $changes = &$delete_drive($conf, $storecfg, $vmid, $drive, $force);
my $volid = $drive->{file};
if ($volid !~ m|^/|) {
my ($path, $owner);
eval { ($path, $owner) = PVE::Storage::path($storecfg, $volid); };
if ($owner && ($owner == $vmid)) {
if ($force) {
eval { PVE::Storage::vdisk_free($storecfg, $volid); };
# fixme: log ?
warn $@ if $@;
} else {
PVE::QemuServer::add_unused_volume($conf, $volid, $vmid);
}
}
}
}
} elsif ($opt =~ m/^unused/) { } elsif ($opt =~ m/^unused/) {
my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt}); my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
my $volid = $drive->{file}; my $volid = $drive->{file};
eval { PVE::Storage::vdisk_free($storecfg, $volid); }; eval { PVE::Storage::vdisk_free($storecfg, $volid); };
# fixme: log ? warn $@ if $@;
warn $@ if $@;
} }
PVE::QemuServer::change_config_nolock($vmid, {}, { $opt => 1 }, 1); PVE::QemuServer::change_config_nolock($vmid, $changes, { $opt => 1 }, 1);
} }
#add foreach my $opt (keys %$param) { # add/change
foreach my $opt (keys %$param) {
$conf = PVE::QemuServer::load_config($vmid); # update/reload $conf = PVE::QemuServer::load_config($vmid); # update/reload
#drives next if $conf->{$opt} && ($param->{$opt} eq $conf->{$opt}); # skip if nothing changed
if (my $drive = $drive_hash->{$opt}) {
#cdrom if (my $drive = $drive_hash->{$opt}) { # drives
if (PVE::QemuServer::drive_is_cdrom($drive) && PVE::QemuServer::check_running($vmid)) {
if ($drive->{file} eq 'none') { my $old_drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt}) if $conf->{$opt};
PVE::QemuServer::vm_monitor_command($vmid, "eject -f drive-$opt", 0);
#delete $param->{$opt}; if ($old_drive && ($drive->{file} ne $old_drive->{file}) &&
} else { !PVE::QemuServer::drive_is_cdrom($old_drive)) { # delete old disks
my $path = PVE::QemuServer::get_iso_path($storecfg, $vmid, $drive->{file});
PVE::QemuServer::vm_monitor_command($vmid, "eject -f drive-$opt", 0); #force eject if locked die "error hot-unplug $opt" if !PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
PVE::QemuServer::vm_monitor_command($vmid, "change drive-$opt \"$path\"", 0) if $path;
} my $changes = &$delete_drive($conf, $storecfg, $vmid, $old_drive, 0);
} else { #hdd PVE::QemuServer::change_config_nolock($vmid, $changes, { $opt => 1 }, 1);
#swap drive $conf = PVE::QemuServer::load_config($vmid); # update/reload
if ($conf->{$opt}){ }
my $old_drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
if ($drive->{file} ne $old_drive->{file} && !PVE::QemuServer::drive_is_cdrom($old_drive)) { if (PVE::QemuServer::drive_is_cdrom($drive)) { #cdrom
my ($path, $owner); if (PVE::QemuServer::check_running($vmid)) {
eval { ($path, $owner) = PVE::Storage::path($storecfg, $old_drive->{file}); }; if ($drive->{file} eq 'none') {
if ($owner && ($owner == $vmid)) { PVE::QemuServer::vm_monitor_command($vmid, "eject -f drive-$opt", 0);
die "error hot-unplug $opt" if !PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt); } else {
PVE::QemuServer::add_unused_volume($conf, $old_drive->{file}, $vmid); my $path = PVE::QemuServer::get_iso_path($storecfg, $vmid, $drive->{file});
} PVE::QemuServer::vm_monitor_command($vmid, "eject -f drive-$opt", 0); #force eject if locked
PVE::QemuServer::vm_monitor_command($vmid, "change drive-$opt \"$path\"", 0) if $path;
} }
} }
my $settings = { $opt => $param->{$opt} };
&$create_disks($rpcenv, $authuser, $storecfg, $vmid, undef, $settings, $conf);
$param->{$opt} = $settings->{$opt};
#hotplug disks
if(!PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt, $drive)) {
PVE::QemuServer::add_unused_volume($conf,$drive->{file},$vmid);
PVE::QemuServer::change_config_nolock($vmid, {}, { $opt => 1 }, 1);
die "error hotplug $opt - put disk in unused";
}
}
PVE::QemuServer::change_config_nolock($vmid, { $opt => $param->{$opt} }, {}, 1); PVE::QemuServer::change_config_nolock($vmid, { $opt => $param->{$opt} }, {}, 1);
} else { #hdd
my $settings = { $opt => $param->{$opt} };
&$create_disks($rpcenv, $authuser, $storecfg, $vmid, undef, $settings);
PVE::QemuServer::change_config_nolock($vmid, { $opt => $settings->{$opt} }, {}, 1);
$conf = PVE::QemuServer::load_config($vmid); # update/reload
my $newdrive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
#hotplug new disks
die "error hotplug $opt" if !PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt, $newdrive);
}
} elsif (my $net = $net_hash->{$opt}) { #nics } elsif (my $net = $net_hash->{$opt}) { #nics
@ -759,13 +771,10 @@ __PACKAGE__->register_method({
!PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt); !PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
PVE::QemuServer::change_config_nolock($vmid, { $opt => $param->{$opt} }, {}, 1); PVE::QemuServer::change_config_nolock($vmid, { $opt => $param->{$opt} }, {}, 1);
$conf = PVE::QemuServer::load_config($vmid); # update/reload
#nic hotplug after config write as we need it for pve-bridge script my $newnet = PVE::QemuServer::parse_net($conf->{$opt});
if(!PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt, $net)) { die "error hotplug $opt" if !PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt, $newnet);
#rewrite conf to remove nic if hotplug fail
PVE::QemuServer::change_config_nolock($vmid, {}, { $opt => 1 }, 1);
die "error hotplug $opt";
}
} else { } else {

5
PVE/QemuServer.pm
View File

@ -1084,7 +1084,7 @@ sub add_random_macs {
} }
sub add_unused_volume { sub add_unused_volume {
my ($config, $volid, $vmid) = @_; my ($config, $volid, $changes) = @_;
my $key; my $key;
for (my $ind = $MAX_UNUSED_DISKS - 1; $ind >= 0; $ind--) { for (my $ind = $MAX_UNUSED_DISKS - 1; $ind >= 0; $ind--) {
@ -1098,8 +1098,7 @@ sub add_unused_volume {
die "To many unused volume - please delete them first.\n" if !$key; die "To many unused volume - please delete them first.\n" if !$key;
PVE::QemuServer::change_config_nolock($vmid, { $key => $volid }, {}, 1); $changes->{$key} = $config->{$key} = $volid;
$config->{$key} = $volid;
} }
# fixme: remove all thos $noerr parameters? # fixme: remove all thos $noerr parameters?