use warnings;
use Cwd 'abs_path';
-use PVE::Cluster;
+use PVE::Cluster qw (cfs_read_file cfs_write_file);;
use PVE::SafeSyslog;
use PVE::Tools qw(extract_param);
use PVE::Exception qw(raise raise_param_exc);
}
};
-my $check_volume_access = sub {
- my ($rpcenv, $authuser, $storecfg, $vmid, $volid, $pool) = @_;
-
- my $path;
- if (my ($sid, $volname) = PVE::Storage::parse_volume_id($volid, 1)) {
- my ($ownervm, $vtype);
- ($path, $ownervm, $vtype) = PVE::Storage::path($storecfg, $volid);
- if ($vtype eq 'iso' || $vtype eq 'vztmpl') {
- # we simply allow access
- } elsif (!$ownervm || ($ownervm != $vmid)) {
- # allow if we are Datastore administrator
- $rpcenv->check_storage_perm($authuser, $vmid, $pool, $sid, [ 'Datastore.Allocate' ]);
- }
- } else {
- die "Only root can pass arbitrary filesystem paths."
- if $authuser ne 'root@pam';
- $path = abs_path($volid);
- }
- return $path;
+my $check_storage_access = sub {
+ my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage) = @_;
+
+ PVE::QemuServer::foreach_drive($settings, sub {
+ my ($ds, $drive) = @_;
+
+ my $isCDROM = PVE::QemuServer::drive_is_cdrom($drive);
+
+ my $volid = $drive->{file};
+
+ if (!$volid || $volid eq 'none') {
+ # nothing to check
+ } elsif ($isCDROM && ($volid eq 'cdrom')) {
+ $rpcenv->check($authuser, "/", ['Sys.Console']);
+ } elsif (!$isCDROM && ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/)) {
+ my ($storeid, $size) = ($2 || $default_storage, $3);
+ die "no storage ID specified (and no default storage)\n" if !$storeid;
+ $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']);
+ } else {
+ $rpcenv->check_volume_access($authuser, $storecfg, $vmid, $volid);
+ }
+ });
};
# Note: $pool is only needed when creating a VM, because pool permissions
my $create_disks = sub {
my ($rpcenv, $authuser, $conf, $storecfg, $vmid, $pool, $settings, $default_storage) = @_;
- # check permissions first
+ my $vollist = [];
- my $alloc = [];
+ my $res = {};
PVE::QemuServer::foreach_drive($settings, sub {
my ($ds, $disk) = @_;
- return if PVE::QemuServer::drive_is_cdrom($disk);
-
my $volid = $disk->{file};
- if ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/) {
+ if (!$volid || $volid eq 'none' || $volid eq 'cdrom') {
+ $res->{$ds} = $settings->{$ds};
+ } elsif ($volid =~ m/^(([^:\s]+):)?(\d+(\.\d+)?)$/) {
my ($storeid, $size) = ($2 || $default_storage, $3);
die "no storage ID specified (and no default storage)\n" if !$storeid;
- $rpcenv->check_storage_perm($authuser, $vmid, $pool, $storeid, [ 'Datastore.AllocateSpace' ]);
my $defformat = PVE::Storage::storage_default_format($storecfg, $storeid);
my $fmt = $disk->{format} || $defformat;
- push @$alloc, [$ds, $disk, $storeid, $size, $fmt];
- } else {
- my $path = &$check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $volid, $pool);
- die "image '$path' does not exists\n" if (!(-f $path || -b $path));
- }
- });
-
- # now try to allocate everything
-
- my $vollist = [];
- eval {
- foreach my $task (@$alloc) {
- my ($ds, $disk, $storeid, $size, $fmt) = @$task;
-
my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid,
$fmt, undef, $size*1024*1024);
-
$disk->{file} = $volid;
push @$vollist, $volid;
+ delete $disk->{format}; # no longer needed
+ $res->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
+ } else {
+ my $path = $rpcenv->check_volume_access($authuser, $storecfg, $vmid, $volid);
+ PVE::Storage::activate_volumes($storecfg, [ $volid ])
+ if PVE::Storage::parse_volume_id ($volid, 1);
+ die "image '$path' does not exists\n" if (!(-f $path || -b $path));
+ $res->{$ds} = $settings->{$ds};
}
- };
+ });
# free allocated images on error
if (my $err = $@) {
}
# modify vm config if everything went well
- foreach my $task (@$alloc) {
- my ($ds, $disk) = @$task;
- delete $disk->{format}; # no longer needed
- $conf->{$ds} = $settings->{$ds} = PVE::QemuServer::print_drive($vmid, $disk);
+ foreach my $ds (keys %$res) {
+ $conf->{$ds} = $res->{$ds};
}
return $vollist;
};
my $check_vm_modify_config_perm = sub {
- my ($rpcenv, $authuser, $vmid, $pool, $param) = @_;
+ my ($rpcenv, $authuser, $vmid, $pool, $key_list) = @_;
- return 1 if $authuser ne 'root@pam';
+ return 1 if $authuser eq 'root@pam';
- foreach my $opt (keys %$param) {
+ foreach my $opt (@$key_list) {
# disk checks need to be done somewhere else
next if PVE::QemuServer::valid_drivename($opt);
if ($opt eq 'sockets' || $opt eq 'cores' ||
$opt eq 'cpu' || $opt eq 'smp' ||
- $opt eq 'cpuimit' || $opt eq 'cpuunits') {
+ $opt eq 'cpulimit' || $opt eq 'cpuunits') {
$rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.CPU']);
} elsif ($opt eq 'boot' || $opt eq 'bootdisk') {
$rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.Disk']);
$rpcenv->check_perm_modify($authuser, "/pool/$pool");
}
- $rpcenv->check_storage_perm($authuser, $vmid, $pool, $storage, [ 'Datastore.AllocateSpace' ])
+ $rpcenv->check($authuser, "/storage/$storage", ['Datastore.AllocateSpace'])
if defined($storage);
if (!$archive) {
&$resolve_cdrom_alias($param);
+ &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param, $storage);
+
+ &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, $pool, [ keys %$param]);
+
foreach my $opt (keys %$param) {
if (PVE::QemuServer::valid_drivename($opt)) {
my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt});
if ($archive eq '-') {
die "pipe requires cli environment\n"
- && $rpcenv->{type} ne 'cli';
+ if $rpcenv->{type} ne 'cli';
} else {
- my $path = &$check_volume_access($rpcenv, $authuser, $storecfg, $vmid, $archive, $pool);
+ my $path = $rpcenv->check_volume_access($authuser, $storecfg, $vmid, $archive);
+
+ PVE::Storage::activate_volumes($storecfg, [ $archive ])
+ if PVE::Storage::parse_volume_id ($archive, 1);
+
die "can't find archive file '$archive'\n" if !($path && -f $path);
$archive = $path;
}
}
+ my $addVMtoPoolFn = sub {
+ my $usercfg = cfs_read_file("user.cfg");
+ if (my $data = $usercfg->{pools}->{$pool}) {
+ $data->{vms}->{$vmid} = 1;
+ $usercfg->{vms}->{$vmid} = $pool;
+ cfs_write_file("user.cfg", $usercfg);
+ }
+ };
+
my $restorefn = sub {
if (-f $filename) {
storage => $storage,
pool => $pool,
unique => $unique });
+
+ PVE::AccessControl::lock_user_config($addVMtoPoolFn, "can't add VM to pool") if $pool;
};
return $rpcenv->fork_worker('qmrestore', $vmid, $authuser, $realcmd);
};
- &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, $pool, $param);
-
my $createfn = sub {
- # second test (after locking test is accurate)
+ # test after locking
die "unable to create vm $vmid: config file already exists\n"
if -f $filename;
my $conf = $param;
eval {
+
$vollist = &$create_disks($rpcenv, $authuser, $conf, $storecfg, $vmid, $pool, $param, $storage);
# try to be smart about bootdisk
$conf->{bootdisk} = $firstdisk;
}
- PVE::QemuServer::update_conf_nolock($vmid, $conf);
+ PVE::QemuServer::update_config_nolock($vmid, $conf);
+
};
my $err = $@;
}
die "create failed - $err";
}
+
+ PVE::AccessControl::lock_user_config($addVMtoPoolFn, "can't add VM to pool") if $pool;
};
return $rpcenv->fork_worker('qmcreate', $vmid, $authuser, $realcmd);
};
- return PVE::QemuServer::lock_config($vmid, $archive ? $restorefn : $createfn);
+ return PVE::QemuServer::lock_config_full($vmid, 1, $archive ? $restorefn : $createfn);
}});
__PACKAGE__->register_method({
return $conf;
}});
+my $vm_is_volid_owner = sub {
+ my ($storecfg, $vmid, $volid) =@_;
+
+ if ($volid !~ m|^/|) {
+ my ($path, $owner);
+ eval { ($path, $owner) = PVE::Storage::path($storecfg, $volid); };
+ if ($owner && ($owner == $vmid)) {
+ return 1;
+ }
+ }
+
+ return undef;
+};
+
+my $test_deallocate_drive = sub {
+ my ($storecfg, $vmid, $key, $drive, $force) = @_;
+
+ if (!PVE::QemuServer::drive_is_cdrom($drive)) {
+ my $volid = $drive->{file};
+ if (&$vm_is_volid_owner($storecfg, $vmid, $volid)) {
+ if ($force || $key =~ m/^unused/) {
+ my $sid = PVE::Storage::parse_volume_id($volid);
+ return $sid;
+ }
+ }
+ }
+
+ return undef;
+};
+
my $delete_drive = sub {
my ($conf, $storecfg, $vmid, $key, $drive, $force) = @_;
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);
- }
- delete $conf->{$key};
+ if (&$vm_is_volid_owner($storecfg, $vmid, $volid)) {
+ if ($force || $key =~ m/^unused/) {
+ eval { PVE::Storage::vdisk_free($storecfg, $volid); };
+ warn $@ if $@;
+ } else {
+ PVE::QemuServer::add_unused_volume($conf, $volid, $vmid);
}
}
+ }
+
+ delete $conf->{$key};
+};
+
+my $vmconfig_delete_option = sub {
+ my ($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $force) = @_;
+
+ return if !defined($conf->{$opt});
+
+ my $isDisk = PVE::QemuServer::valid_drivename($opt)|| ($opt =~ m/^unused/);
+
+ if ($isDisk) {
+ $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']);
+
+ my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
+ if (my $sid = &$test_deallocate_drive($storecfg, $vmid, $opt, $drive, $force)) {
+ $rpcenv->check($authuser, "/storage/$sid", ['Datastore.Allocate']);
+ }
+ }
+
+ die "error hot-unplug $opt" if !PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
+
+ if ($isDisk) {
+ my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
+ &$delete_drive($conf, $storecfg, $vmid, $opt, $drive, $force);
} else {
+ delete $conf->{$opt};
+ }
+
+ PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+};
+
+my $vmconfig_update_disk = sub {
+ my ($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $value, $force) = @_;
+
+ my $drive = PVE::QemuServer::parse_drive($opt, $value);
+
+ if (PVE::QemuServer::drive_is_cdrom($drive)) { #cdrom
+ $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.CDROM']);
+ } else {
+ $rpcenv->check_vm_perm($authuser, $vmid, undef, ['VM.Config.Disk']);
+ }
+
+ if ($conf->{$opt}) {
+
+ if (my $old_drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt})) {
+
+ my $media = $drive->{media} || 'disk';
+ my $oldmedia = $old_drive->{media} || 'disk';
+ die "unable to change media type\n" if $media ne $oldmedia;
+
+ if (!PVE::QemuServer::drive_is_cdrom($old_drive) &&
+ ($drive->{file} ne $old_drive->{file})) { # delete old disks
+
+ &$vmconfig_delete_option($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $force);
+ $conf = PVE::QemuServer::load_config($vmid); # update/reload
+ }
+ }
+ }
+
+ &$create_disks($rpcenv, $authuser, $conf, $storecfg, $vmid, undef, {$opt => $value});
+ PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+
+ $conf = PVE::QemuServer::load_config($vmid); # update/reload
+ $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
+
+ if (PVE::QemuServer::drive_is_cdrom($drive)) { # cdrom
+
+ if (PVE::QemuServer::check_running($vmid)) {
+ if ($drive->{file} eq 'none') {
+ PVE::QemuServer::vm_monitor_command($vmid, "eject -f drive-$opt", 0);
+ } else {
+ 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;
+ }
+ }
+
+ } else { # hotplug new disks
+ die "error hotplug $opt" if !PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt, $drive);
}
};
+my $vmconfig_update_net = sub {
+ my ($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $value) = @_;
+
+ if ($conf->{$opt}) {
+ #if online update, then unplug first
+ die "error hot-unplug $opt for update" if !PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
+ }
+
+ $conf->{$opt} = $value;
+ PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+ $conf = PVE::QemuServer::load_config($vmid); # update/reload
+
+ my $net = PVE::QemuServer::parse_net($conf->{$opt});
+
+ die "error hotplug $opt" if !PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt, $net);
+};
+
my $vm_config_perm_list = [
'VM.Config.Disk',
'VM.Config.CDROM',
if (!PVE::QemuServer::option_exists($opt)) {
raise_param_exc({ delete => "unknown option '$opt'" });
}
+
push @delete, $opt;
}
- my $drive_hash = {};
- my $net_hash = {};
foreach my $opt (keys %$param) {
if (PVE::QemuServer::valid_drivename($opt)) {
# cleanup drive path
my $drive = PVE::QemuServer::parse_drive($opt, $param->{$opt});
PVE::QemuServer::cleanup_drive_path($opt, $storecfg, $drive);
$param->{$opt} = PVE::QemuServer::print_drive($vmid, $drive);
- $drive_hash->{$opt} = $drive;
} elsif ($opt =~ m/^net(\d+)$/) {
# add macaddr
my $net = PVE::QemuServer::parse_net($param->{$opt});
$param->{$opt} = PVE::QemuServer::print_net($net);
- $net_hash->{$opt} = $net;
}
}
+ &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, undef, [@delete]);
+
+ &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, undef, [keys %$param]);
+
+ &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param);
my $updatefn = sub {
PVE::Cluster::log_msg('info', $authuser, "update VM $vmid: " . join (' ', @paramarr));
foreach my $opt (@delete) { # delete
-
$conf = PVE::QemuServer::load_config($vmid); # update/reload
-
- next if !defined($conf->{$opt});
-
- die "error hot-unplug $opt" if !PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
-
- if (PVE::QemuServer::valid_drivename($opt)) {
- my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
- &$delete_drive($conf, $storecfg, $vmid, $opt, $drive, $force);
- } elsif ($opt =~ m/^unused/) {
- my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
- my $volid = $drive->{file};
- eval { PVE::Storage::vdisk_free($storecfg, $volid); };
- warn $@ if $@;
- delete $conf->{$opt};
- }
- PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
+ &$vmconfig_delete_option($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $force);
}
foreach my $opt (keys %$param) { # add/change
next if $conf->{$opt} && ($param->{$opt} eq $conf->{$opt}); # skip if nothing changed
- if (my $drive = $drive_hash->{$opt}) { # drives
-
- my $old_drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt}) if $conf->{$opt};
-
- if ($old_drive && ($drive->{file} ne $old_drive->{file}) &&
- !PVE::QemuServer::drive_is_cdrom($old_drive)) { # delete old disks
-
- die "error hot-unplug $opt" if !PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
-
- &$delete_drive($conf, $storecfg, $vmid, $opt, $old_drive, 0);
- PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
- $conf = PVE::QemuServer::load_config($vmid); # update/reload
- }
-
- if (PVE::QemuServer::drive_is_cdrom($drive)) { #cdrom
-
- if (PVE::QemuServer::check_running($vmid)) {
- if ($drive->{file} eq 'none') {
- PVE::QemuServer::vm_monitor_command($vmid, "eject -f drive-$opt", 0);
- } else {
- 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;
- }
- }
-
- $conf->{$opt} = $param->{$opt};
- PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
-
- } else { #hdd
-
- my $settings = { $opt => $param->{$opt} };
- &$create_disks($rpcenv, $authuser, $conf, $storecfg, $vmid, undef, $settings);
- PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
- $conf = PVE::QemuServer::load_config($vmid); # update/reload
-
- my $newdrive = PVE::QemuServer::parse_drive($opt, $conf->{$opt});
+ if (PVE::QemuServer::valid_drivename($opt)) {
- #hotplug new disks
- die "error hotplug $opt" if !PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt, $newdrive);
- }
+ &$vmconfig_update_disk($rpcenv, $authuser, $conf, $storecfg, $vmid,
+ $opt, $param->{$opt}, $force);
- } elsif (my $net = $net_hash->{$opt}) { #nics
-
- #if online update, then unplug first
- die "error hot-unplug $opt for update" if $conf->{$opt} &&
- !PVE::QemuServer::vm_deviceunplug($vmid, $conf, $opt);
-
- $conf->{$opt} = $param->{$opt};
- PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
- $conf = PVE::QemuServer::load_config($vmid); # update/reload
-
- my $newnet = PVE::QemuServer::parse_net($conf->{$opt});
+ } elsif ($opt =~ m/^net(\d+)$/) { #nics
- die "error hotplug $opt" if !PVE::QemuServer::vm_deviceplug($storecfg, $conf, $vmid, $opt, $newnet);
+ &$vmconfig_update_net($rpcenv, $authuser, $conf, $storecfg, $vmid,
+ $opt, $param->{$opt});
} else {
my $storecfg = PVE::Storage::config();
+ my $delVMfromPoolFn = sub {
+ my $usercfg = cfs_read_file("user.cfg");
+ my $pool = $usercfg->{vms}->{$vmid};
+ if (my $data = $usercfg->{pools}->{$pool}) {
+ delete $data->{vms}->{$vmid};
+ delete $usercfg->{vms}->{$vmid};
+ cfs_write_file("user.cfg", $usercfg);
+ }
+ };
+
my $realcmd = sub {
my $upid = shift;
syslog('info', "destroy VM $vmid: $upid\n");
PVE::QemuServer::vm_destroy($storecfg, $vmid, $skiplock);
+
+ PVE::AccessControl::lock_user_config($delVMfromPoolFn, "pool cleanup failed");
};
return $rpcenv->fork_worker('qmdestroy', $vmid, $authuser, $realcmd);
return $res;
}});
+my $vm_is_ha_managed = sub {
+ my ($vmid) = @_;
+
+ my $cc = PVE::Cluster::cfs_read_file('cluster.conf');
+ if (PVE::Cluster::cluster_conf_lookup_pvevm($cc, 0, $vmid, 1)) {
+ return 1;
+ }
+ return 0;
+};
+
__PACKAGE__->register_method({
name => 'vm_status',
path => '{vmid}/status/current',
my $vmstatus = PVE::QemuServer::vmstatus($param->{vmid});
my $status = $vmstatus->{$param->{vmid}};
- my $cc = PVE::Cluster::cfs_read_file('cluster.conf');
- if (PVE::Cluster::cluster_conf_lookup_pvevm($cc, 0, $param->{vmid}, 1)) {
- $status->{ha} = 1;
- } else {
- $status->{ha} = 0;
- }
+ $status->{ha} = &$vm_is_ha_managed($param->{vmid});
return $status;
}});
my $storecfg = PVE::Storage::config();
- my $realcmd = sub {
- my $upid = shift;
+ if (&$vm_is_ha_managed($vmid) && !$stateuri &&
+ $rpcenv->{type} ne 'ha') {
- syslog('info', "start VM $vmid: $upid\n");
+ my $hacmd = sub {
+ my $upid = shift;
- PVE::QemuServer::vm_start($storecfg, $vmid, $stateuri, $skiplock);
+ my $service = "pvevm:$vmid";
- return;
- };
+ my $cmd = ['clusvcadm', '-e', $service, '-m', $node];
- return $rpcenv->fork_worker('qmstart', $vmid, $authuser, $realcmd);
+ print "Executing HA start for VM $vmid\n";
+
+ PVE::Tools::run_command($cmd);
+
+ return;
+ };
+
+ return $rpcenv->fork_worker('hastart', $vmid, $authuser, $hacmd);
+
+ } else {
+
+ my $realcmd = sub {
+ my $upid = shift;
+
+ syslog('info', "start VM $vmid: $upid\n");
+
+ PVE::QemuServer::vm_start($storecfg, $vmid, $stateuri, $skiplock);
+
+ return;
+ };
+
+ return $rpcenv->fork_worker('qmstart', $vmid, $authuser, $realcmd);
+ }
}});
__PACKAGE__->register_method({
my $storecfg = PVE::Storage::config();
- my $realcmd = sub {
- my $upid = shift;
+ if (&$vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
- syslog('info', "stop VM $vmid: $upid\n");
+ my $hacmd = sub {
+ my $upid = shift;
- PVE::QemuServer::vm_stop($storecfg, $vmid, $skiplock, 0,
- $param->{timeout}, 0, 1, $keepActive);
+ my $service = "pvevm:$vmid";
- return;
- };
+ my $cmd = ['clusvcadm', '-d', $service];
+
+ print "Executing HA stop for VM $vmid\n";
+
+ PVE::Tools::run_command($cmd);
+
+ return;
+ };
+
+ return $rpcenv->fork_worker('hastop', $vmid, $authuser, $hacmd);
+
+ } else {
+ my $realcmd = sub {
+ my $upid = shift;
+
+ syslog('info', "stop VM $vmid: $upid\n");
- return $rpcenv->fork_worker('qmstop', $vmid, $authuser, $realcmd);
+ PVE::QemuServer::vm_stop($storecfg, $vmid, $skiplock, 0,
+ $param->{timeout}, 0, 1, $keepActive);
+
+ return;
+ };
+
+ return $rpcenv->fork_worker('qmstop', $vmid, $authuser, $realcmd);
+ }
}});
__PACKAGE__->register_method({
if !$param->{online};
}
- my $realcmd = sub {
- my $upid = shift;
+ my $storecfg = PVE::Storage::config();
+ PVE::QemuServer::check_storage_availability($storecfg, $conf, $target);
- PVE::QemuMigrate->migrate($target, $targetip, $vmid, $param);
- };
+ if (&$vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
+
+ my $hacmd = sub {
+ my $upid = shift;
+
+ my $service = "pvevm:$vmid";
+
+ my $cmd = ['clusvcadm', '-M', $service, '-m', $target];
+
+ print "Executing HA migrate for VM $vmid to node $target\n";
- my $upid = $rpcenv->fork_worker('qmigrate', $vmid, $authuser, $realcmd);
+ PVE::Tools::run_command($cmd);
+
+ return;
+ };
+
+ return $rpcenv->fork_worker('hamigrate', $vmid, $authuser, $hacmd);
+
+ } else {
+
+ my $realcmd = sub {
+ my $upid = shift;
+
+ PVE::QemuMigrate->migrate($target, $targetip, $vmid, $param);
+ };
+
+ return $rpcenv->fork_worker('qmigrate', $vmid, $authuser, $realcmd);
+ }
- return $upid;
}});
__PACKAGE__->register_method({
projects / qemu-server.git / blobdiff