External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-27 19:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

bhyve: drop virProcessKillPainfully() from destroy

Browse Source 
Current implementation of domainDestroy for bhyve calls
virProcessKillPainfully() for the bhyve process and then
executes "bhyvectl --destroy".

This is wrong for two reasons:

 * bhyvectl --destroy alone is sufficient because it terminates
   the process
 * virProcessKillPainfully() first sends SIGTERM and after few
   attempts sends SIGKILL. As SIGTERM triggers ACPI shutdown that
   we're not interested in, it creates an unwanted side effect in
   domainDestroy.

Also, destroy monitor only after "bhyvectl --destroy" command succeeded
to avoid a case when the command fails and domain remains running, but
not being monitored anymore.
This commit is contained in:
Roman Bogorodskiy 2016-05-04 19:41:58 +03:00
parent a4ef805758
commit c35c2fe78e
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bhyve/bhyve_process.c
View File

@ -278,26 +278,18 @@ virBhyveProcessStop(bhyveConnPtr driver,
return -1;
}
if ((priv != NULL) && (priv->mon != NULL))
bhyveMonitorClose(priv->mon);
/* First, try to kill 'bhyve' process */
if (virProcessKillPainfully(vm->pid, true) != 0)
VIR_WARN("Failed to gracefully stop bhyve VM '%s' (pid: %d)",
vm->def->name,
(int)vm->pid);
/* Cleanup network interfaces */
bhyveNetCleanup(vm);
/* No matter if shutdown was successful or not, we
* need to unload the VM */
if (!(cmd = virBhyveProcessBuildDestroyCmd(driver, vm->def)))
goto cleanup;
return -1;
if (virCommandRun(cmd, NULL) < 0)
goto cleanup;
if ((priv != NULL) && (priv->mon != NULL))
bhyveMonitorClose(priv->mon);
/* Cleanup network interfaces */
bhyveNetCleanup(vm);
ret = 0;
virCloseCallbacksUnset(driver->closeCallbacks, vm,