External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-05 04:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

ch: kill CH process if restore fails

Browse Source 
Invoke virCHProcessStop to kill CH process incase of any failures during
restore operation.

Signed-off-by: Purna Pavan Chandra <paekkaladevi@linux.microsoft.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Purna Pavan Chandra 2024-08-05 14:41:00 +00:00 committed by Michal Privoznik
parent 0587ee2aab
commit c4be2cb2de
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ch/ch_process.c
View File

@ -981,7 +981,7 @@ virCHProcessStartRestore(virCHDriver *driver, virDomainObj *vm, const char *from
if (!(priv->monitor = virCHProcessConnectMonitor(driver, vm))) { if (!(priv->monitor = virCHProcessConnectMonitor(driver, vm))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to create connection to CH socket")); _("failed to create connection to CH socket"));
return -1; goto cleanup;
} }
} }
@ -992,7 +992,7 @@ virCHProcessStartRestore(virCHDriver *driver, virDomainObj *vm, const char *from
if (virCHMonitorBuildRestoreJson(vm->def, from, &payload) < 0) { if (virCHMonitorBuildRestoreJson(vm->def, from, &payload) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to restore domain")); _("failed to restore domain"));
return -1; goto cleanup;
} }
virBufferAddLit(&http_headers, "PUT /api/v1/vm.restore HTTP/1.1\r\n"); virBufferAddLit(&http_headers, "PUT /api/v1/vm.restore HTTP/1.1\r\n");
@ -1005,7 +1005,7 @@ virCHProcessStartRestore(virCHDriver *driver, virDomainObj *vm, const char *from
payload = virBufferContentAndReset(&buf); payload = virBufferContentAndReset(&buf);
if ((mon_sockfd = chMonitorSocketConnect(priv->monitor)) < 0) if ((mon_sockfd = chMonitorSocketConnect(priv->monitor)) < 0)
return -1; goto cleanup;
if (virCHRestoreCreateNetworkDevices(driver, vm->def, &tapfds, &ntapfds, &nicindexes, &nnicindexes) < 0) if (virCHRestoreCreateNetworkDevices(driver, vm->def, &tapfds, &ntapfds, &nicindexes, &nnicindexes) < 0)
goto cleanup; goto cleanup;
@ -1042,5 +1042,7 @@ virCHProcessStartRestore(virCHDriver *driver, virDomainObj *vm, const char *from
cleanup: cleanup:
if (tapfds) if (tapfds)
chCloseFDs(tapfds, ntapfds); chCloseFDs(tapfds, ntapfds);
if (ret)
virCHProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED);
return ret; return ret;
} }