External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-22 14:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Introduce storagePoolRefreshFailCleanup

Browse Source 
Create a common pool refresh failure handling method as the
same code is repeated multiple times.

Signed-off-by: John Ferlan <jferlan@redhat.com>
ACKed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
John Ferlan 2018-09-12 09:35:42 -04:00
parent 1ff45609d6
commit 5745f08cea
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/storage/storage_driver.c
View File

@ -76,6 +76,18 @@ static void storageDriverUnlock(void)
} }
static void
storagePoolRefreshFailCleanup(virStorageBackendPtr backend,
virStoragePoolObjPtr obj,
const char *stateFile)
{
if (stateFile)
ignore_value(unlink(stateFile));
if (backend->stopPool)
backend->stopPool(obj);
}
/** /**
* virStoragePoolUpdateInactive: * virStoragePoolUpdateInactive:
* @poolptr: pointer to a variable holding the pool object pointer * @poolptr: pointer to a variable holding the pool object pointer
@ -124,6 +136,7 @@ storagePoolUpdateStateCallback(virStoragePoolObjPtr obj,
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to initialize storage pool '%s': %s"), _("Failed to initialize storage pool '%s': %s"),
def->name, virGetLastErrorMessage()); def->name, virGetLastErrorMessage());
ignore_value(unlink(stateFile));
active = false; active = false;
} }
@ -134,8 +147,7 @@ storagePoolUpdateStateCallback(virStoragePoolObjPtr obj,
if (active) { if (active) {
virStoragePoolObjClearVols(obj); virStoragePoolObjClearVols(obj);
if (backend->refreshPool(obj) < 0) { if (backend->refreshPool(obj) < 0) {
if (backend->stopPool) storagePoolRefreshFailCleanup(backend, obj, stateFile);
backend->stopPool(obj);
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to restart storage pool '%s': %s"), _("Failed to restart storage pool '%s': %s"),
def->name, virGetLastErrorMessage()); def->name, virGetLastErrorMessage());
@ -148,8 +160,6 @@ storagePoolUpdateStateCallback(virStoragePoolObjPtr obj,
if (!virStoragePoolObjIsActive(obj)) if (!virStoragePoolObjIsActive(obj))
virStoragePoolUpdateInactive(&obj); virStoragePoolUpdateInactive(&obj);
if (!active)
ignore_value(unlink(stateFile));
VIR_FREE(stateFile); VIR_FREE(stateFile);
return; return;
@ -196,10 +206,7 @@ storageDriverAutostartCallback(virStoragePoolObjPtr obj,
if (!stateFile || if (!stateFile ||
virStoragePoolSaveState(stateFile, def) < 0 || virStoragePoolSaveState(stateFile, def) < 0 ||
backend->refreshPool(obj) < 0) { backend->refreshPool(obj) < 0) {
if (stateFile) storagePoolRefreshFailCleanup(backend, obj, stateFile);
unlink(stateFile);
if (backend->stopPool)
backend->stopPool(obj);
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to autostart storage pool '%s': %s"), _("Failed to autostart storage pool '%s': %s"),
def->name, virGetLastErrorMessage()); def->name, virGetLastErrorMessage());
@ -735,10 +742,7 @@ storagePoolCreateXML(virConnectPtr conn,
virStoragePoolObjClearVols(obj); virStoragePoolObjClearVols(obj);
if (!stateFile || virStoragePoolSaveState(stateFile, def) < 0 || if (!stateFile || virStoragePoolSaveState(stateFile, def) < 0 ||
backend->refreshPool(obj) < 0) { backend->refreshPool(obj) < 0) {
if (stateFile) storagePoolRefreshFailCleanup(backend, obj, stateFile);
unlink(stateFile);
if (backend->stopPool)
backend->stopPool(obj);
goto error; goto error;
} }
@ -936,10 +940,7 @@ storagePoolCreate(virStoragePoolPtr pool,
virStoragePoolObjClearVols(obj); virStoragePoolObjClearVols(obj);
if (!stateFile || virStoragePoolSaveState(stateFile, def) < 0 || if (!stateFile || virStoragePoolSaveState(stateFile, def) < 0 ||
backend->refreshPool(obj) < 0) { backend->refreshPool(obj) < 0) {
if (stateFile) storagePoolRefreshFailCleanup(backend, obj, stateFile);
unlink(stateFile);
if (backend->stopPool)
backend->stopPool(obj);
goto cleanup; goto cleanup;
} }
@ -1171,10 +1172,7 @@ storagePoolRefresh(virStoragePoolPtr pool,
if (backend->refreshPool(obj) < 0) { if (backend->refreshPool(obj) < 0) {
char *stateFile = virFileBuildPath(driver->stateDir, def->name, ".xml"); char *stateFile = virFileBuildPath(driver->stateDir, def->name, ".xml");
if (stateFile) storagePoolRefreshFailCleanup(backend, obj, stateFile);
unlink(stateFile);
if (backend->stopPool)
backend->stopPool(obj);
VIR_FREE(stateFile); VIR_FREE(stateFile);
event = virStoragePoolEventLifecycleNew(def->name, event = virStoragePoolEventLifecycleNew(def->name,