External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

storage: Break out storageDriverLoadPoolState

Browse Source 
Will simplify a future patch
This commit is contained in:
Cole Robinson 2015-04-27 10:43:22 -04:00
parent c180a3dcf7
commit af9dc75c1f
1 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/storage/storage_driver.c
View File

@ -74,15 +74,59 @@ static void storageDriverUnlock(void)
virMutexUnlock(&driver->lock); virMutexUnlock(&driver->lock);
} }
static void
storagePoolUpdateState(virStoragePoolObjPtr pool)
{
bool active;
virStorageBackendPtr backend;
if ((backend = virStorageBackendForType(pool->def->type)) == NULL) {
VIR_ERROR(_("Missing backend %d"), pool->def->type);
goto error;
}
/* Backends which do not support 'checkPool' are considered
* inactive by default.
*/
active = false;
if (backend->checkPool &&
backend->checkPool(pool, &active) < 0) {
virErrorPtr err = virGetLastError();
VIR_ERROR(_("Failed to initialize storage pool '%s': %s"),
pool->def->name, err ? err->message :
_("no error message found"));
goto error;
}
/* We can pass NULL as connection, most backends do not use
* it anyway, but if they do and fail, we want to log error and
* continue with other pools.
*/
if (active) {
virStoragePoolObjClearVols(pool);
if (backend->refreshPool(NULL, pool) < 0) {
virErrorPtr err = virGetLastError();
if (backend->stopPool)
backend->stopPool(NULL, pool);
VIR_ERROR(_("Failed to restart storage pool '%s': %s"),
pool->def->name, err ? err->message :
_("no error message found"));
goto error;
}
}
pool->active = active;
error:
return;
}
static void static void
storagePoolUpdateAllState(void) storagePoolUpdateAllState(void)
{ {
size_t i; size_t i;
bool active;
for (i = 0; i < driver->pools.count; i++) { for (i = 0; i < driver->pools.count; i++) {
virStoragePoolObjPtr pool = driver->pools.objs[i]; virStoragePoolObjPtr pool = driver->pools.objs[i];
virStorageBackendPtr backend;
virStoragePoolObjLock(pool); virStoragePoolObjLock(pool);
if (!virStoragePoolObjIsActive(pool)) { if (!virStoragePoolObjIsActive(pool)) {
@ -90,45 +134,7 @@ storagePoolUpdateAllState(void)
continue; continue;
} }
if ((backend = virStorageBackendForType(pool->def->type)) == NULL) { storagePoolUpdateState(pool);
VIR_ERROR(_("Missing backend %d"), pool->def->type);
virStoragePoolObjUnlock(pool);
continue;
}
/* Backends which do not support 'checkPool' are considered
* inactive by default.
*/
active = false;
if (backend->checkPool &&
backend->checkPool(pool, &active) < 0) {
virErrorPtr err = virGetLastError();
VIR_ERROR(_("Failed to initialize storage pool '%s': %s"),
pool->def->name, err ? err->message :
_("no error message found"));
virStoragePoolObjUnlock(pool);
continue;
}
/* We can pass NULL as connection, most backends do not use
* it anyway, but if they do and fail, we want to log error and
* continue with other pools.
*/
if (active) {
virStoragePoolObjClearVols(pool);
if (backend->refreshPool(NULL, pool) < 0) {
virErrorPtr err = virGetLastError();
if (backend->stopPool)
backend->stopPool(NULL, pool);
VIR_ERROR(_("Failed to restart storage pool '%s': %s"),
pool->def->name, err ? err->message :
_("no error message found"));
virStoragePoolObjUnlock(pool);
continue;
}
}
pool->active = active;
virStoragePoolObjUnlock(pool); virStoragePoolObjUnlock(pool);
} }
} }