proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-08 06:38:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: add migrate with local disks to bulk migrate api

Browse Source 
Signed-off-by: Tim Marx <t.marx@proxmox.com>
This commit is contained in:
Tim Marx 2019-11-29 15:10:14 +01:00 committed by Thomas Lamprecht
parent d6896db530
commit fc6b77a1f6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/API2/Nodes.pm
View File

@ -1918,7 +1918,7 @@ __PACKAGE__->register_method ({
}}); }});
my $create_migrate_worker = sub { my $create_migrate_worker = sub {
my ($nodename, $type, $vmid, $target) = @_; my ($nodename, $type, $vmid, $target, $with_local_disks) = @_;
my $upid; my $upid;
if ($type eq 'lxc') { if ($type eq 'lxc') {
@ -1930,7 +1930,7 @@ my $create_migrate_worker = sub {
my $online = PVE::QemuServer::check_running($vmid, 1) ? 1 : 0; my $online = PVE::QemuServer::check_running($vmid, 1) ? 1 : 0;
print STDERR "Migrating VM $vmid\n"; print STDERR "Migrating VM $vmid\n";
$upid = PVE::API2::Qemu->migrate_vm({node => $nodename, vmid => $vmid, target => $target, $upid = PVE::API2::Qemu->migrate_vm({node => $nodename, vmid => $vmid, target => $target,
online => $online }); online => $online, 'with-local-disks' => $with_local_disks});
} else { } else {
die "unknown VM type '$type'\n"; die "unknown VM type '$type'\n";
} }
@ -1968,6 +1968,11 @@ __PACKAGE__->register_method ({
type => 'string', format => 'pve-vmid-list', type => 'string', format => 'pve-vmid-list',
optional => 1, optional => 1,
}, },
"with-local-disks" => {
type => 'boolean',
description => "Enable live storage migration for local disk",
optional => 1,
},
}, },
}, },
returns => { returns => {
@ -1983,6 +1988,7 @@ __PACKAGE__->register_method ({
$nodename = PVE::INotify::nodename() if $nodename eq 'localhost'; $nodename = PVE::INotify::nodename() if $nodename eq 'localhost';
my $target = $param->{target}; my $target = $param->{target};
my $with_local_disks = $param->{'with-local-disks'};
raise_param_exc({ target => "target is local node."}) if $target eq $nodename; raise_param_exc({ target => "target is local node."}) if $target eq $nodename;
PVE::Cluster::check_cfs_quorum(); PVE::Cluster::check_cfs_quorum();
@ -2003,7 +2009,7 @@ __PACKAGE__->register_method ({
foreach my $vmid (sort keys %$vmlist) { foreach my $vmid (sort keys %$vmlist) {
my $d = $vmlist->{$vmid}; my $d = $vmlist->{$vmid};
my $pid; my $pid;
eval { $pid = &$create_migrate_worker($nodename, $d->{type}, $vmid, $target); }; eval { $pid = &$create_migrate_worker($nodename, $d->{type}, $vmid, $target, $with_local_disks); };
warn $@ if $@; warn $@ if $@;
next if !$pid; next if !$pid;