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

implement forceStop for vm_shutdown

Browse Source
This commit is contained in:
Dietmar Maurer 2011-12-15 12:47:39 +01:00
parent 17eed025b3
commit 9269013a93
4 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ RELEASE=2.0
VERSION=2.0 VERSION=2.0
PACKAGE=qemu-server PACKAGE=qemu-server
PKGREL=11 PKGREL=12
DESTDIR= DESTDIR=
PREFIX=/usr PREFIX=/usr

9
PVE/API2/Qemu.pm
View File

@ -991,6 +991,12 @@ __PACKAGE__->register_method({
type => 'integer', type => 'integer',
minimum => 0, minimum => 0,
optional => 1, optional => 1,
},
forceStop => {
description => "Make sure the VM stops.",
type => 'boolean',
optional => 1,
default => 0,
} }
}, },
}, },
@ -1021,7 +1027,8 @@ __PACKAGE__->register_method({
syslog('info', "shutdown VM $vmid: $upid\n"); syslog('info', "shutdown VM $vmid: $upid\n");
PVE::QemuServer::vm_shutdown($storecfg, $vmid, $skiplock, $param->{timeout}); PVE::QemuServer::vm_stop($storecfg, $vmid, $skiplock, 0,
$param->{timeout}, 1, $param->{forceStop});
return; return;
}; };

64
PVE/QemuServer.pm
View File

@ -2575,43 +2575,14 @@ sub vm_stop_cleanup {
PVE::Storage::deactivate_volumes($storecfg, $vollist); PVE::Storage::deactivate_volumes($storecfg, $vollist);
} }
sub vm_shutdown {
my ($storecfg, $vmid, $skiplock, $timeout) = @_;
$timeout = 60 if !$timeout;
lock_config($vmid, sub {
my $conf = load_config($vmid);
check_lock($conf) if !$skiplock;
vm_monitor_command($vmid, "system_powerdown");
my $pid = check_running($vmid);
if ($pid && $timeout) {
print "waiting until VM $vmid stopps (PID $pid)\n";
my $count = 0;
while (($count < $timeout) && check_running($vmid)) {
$count++;
sleep 1;
}
die "shutdown failed - got timeout\n" if check_running($vmid);
}
vm_stop_cleanup($storecfg, $vmid, $conf);
});
}
# Note: use $nockeck to skip tests if VM configuration file exists. # Note: use $nockeck to skip tests if VM configuration file exists.
# We need that when migration VMs to other nodes (files already moved) # We need that when migration VMs to other nodes (files already moved)
sub vm_stop { sub vm_stop {
my ($storecfg, $vmid, $skiplock, $nocheck, $timeout) = @_; my ($storecfg, $vmid, $skiplock, $nocheck, $timeout, $shutdown, $force) = @_;
$timeout = 60 if !$timeout; $timeout = 60 if !defined($timeout);
$force = 1 if !defined($force) && !$shutdown;
lock_config($vmid, sub { lock_config($vmid, sub {
@ -2624,7 +2595,13 @@ sub vm_stop {
check_lock($conf) if !$skiplock; check_lock($conf) if !$skiplock;
} }
eval { vm_monitor_command($vmid, "quit", $nocheck); }; eval {
if ($shutdown) {
vm_monitor_command($vmid, "system_powerdown", $nocheck);
} else {
vm_monitor_command($vmid, "quit", $nocheck);
}
};
my $err = $@; my $err = $@;
if (!$err) { if (!$err) {
@ -2635,12 +2612,23 @@ sub vm_stop {
} }
if ($count >= $timeout) { if ($count >= $timeout) {
warn "VM still running - terminating now with SIGTERM\n"; if ($force) {
kill 15, $pid; warn "VM still running - terminating now with SIGTERM\n";
kill 15, $pid;
} else {
die "VM quit/powerdown failed - got timeout\n";
}
} else {
vm_stop_cleanup($storecfg, $vmid, $conf) if $conf;
return;
} }
} else { } else {
warn "VM quit failed - terminating now with SIGTERM\n"; if ($force) {
kill 15, $pid; warn "VM quit/powerdown failed - terminating now with SIGTERM\n";
kill 15, $pid;
} else {
die "VM quit/powerdown failed\n";
}
} }
# wait again # wait again

6
changelog.Debian
View File

@ -1,3 +1,9 @@
qemu-server (2.0-12) unstable; urgency=low
* implement forceStop option for shutdown
-- Proxmox Support Team <support@proxmox.com> Thu, 15 Dec 2011 12:58:00 +0100
qemu-server (2.0-11) unstable; urgency=low qemu-server (2.0-11) unstable; urgency=low
* do not use ehci by default * do not use ehci by default