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

qm mtunnel/migrate: add resume VMID command

Browse Source 
and reformat the legacy SSH variant for readability.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2017-08-04 14:54:04 +02:00 committed by Wolfgang Bumiller
parent bcb51ae8f9
commit 1d5aaa1db5
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/CLI/qm.pm
View File

@ -280,6 +280,18 @@ __PACKAGE__->register_method ({
if ($line =~ /^quit$/) {
$tunnel_write->("OK");
last;
} elsif ($line =~ /^resume (\d+)$/) {
my $vmid = $1;
if (PVE::QemuServer::check_running($vmid, 1)) {
eval { PVE::QemuServer::vm_resume($vmid, 1, 1); };
if ($@) {
$tunnel_write->("ERR: resume failed - $@");
} else {
$tunnel_write->("OK");
}
} else {
$tunnel_write->("ERR: resume failed - VM $vmid not running");
}
}
}

24
PVE/QemuMigrate.pm
View File

@ -906,6 +906,8 @@ sub phase3_cleanup {
my $conf = $self->{vmconf};
return if $self->{phase2errors};
my $tunnel = $self->{tunnel};
if ($self->{storage_migration}) {
# finish block-job
eval { PVE::QemuServer::qemu_drive_mirror_monitor($vmid, undef, $self->{storage_migration_jobs}); };
@ -951,18 +953,28 @@ sub phase3_cleanup {
$self->{errors} = 1;
}
}
# config moved and nbd server stopped - now we can resume vm on target
my $cmd = [@{$self->{rem_ssh}}, 'qm', 'resume', $vmid, '--skiplock', '--nocheck'];
eval{ PVE::Tools::run_command($cmd, outfunc => sub {},
errfunc => sub {
my $line = shift;
$self->log('err', $line);
});
if ($tunnel && $tunnel->{version} && $tunnel->{version} >= 1) {
eval {
$self->write_tunnel($tunnel, 30, "resume $vmid");
};
if (my $err = $@) {
$self->log('err', $err);
$self->{errors} = 1;
}
} else {
my $cmd = [@{$self->{rem_ssh}}, 'qm', 'resume', $vmid, '--skiplock', '--nocheck'];
my $logf = sub {
my $line = shift;
$self->log('err', $line);
};
eval { PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => $logf); };
if (my $err = $@) {
$self->log('err', $err);
$self->{errors} = 1;
}
}
}
eval {