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

sheepdog: skip refresh on creation failure

Browse Source 
Don't try to refresh Sheepdog volume if creating volume fails.

Signed-off-by: Harry Wei <harryxiyou@gmail.com>
This commit is contained in:
Harry Wei 2013-02-08 14:48:43 +08:00 committed by Eric Blake
parent f3531a040c
commit ad11ecd965
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/storage/storage_backend_sheepdog.c
View File

@ -156,7 +156,7 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED,
virStorageVolDefPtr vol) virStorageVolDefPtr vol)
{ {
int ret; int ret = -1;
if (vol->target.encryption != NULL) { if (vol->target.encryption != NULL) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@ -167,10 +167,14 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED,
virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL); virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL);
virCommandAddArgFormat(cmd, "%llu", vol->capacity); virCommandAddArgFormat(cmd, "%llu", vol->capacity);
virStorageBackendSheepdogAddHostArg(cmd, pool); virStorageBackendSheepdogAddHostArg(cmd, pool);
ret = virCommandRun(cmd, NULL); if (virCommandRun(cmd, NULL) < 0)
goto cleanup;
virStorageBackendSheepdogRefreshVol(conn, pool, vol); if (virStorageBackendSheepdogRefreshVol(conn, pool, vol) < 0)
goto cleanup;
ret = 0;
cleanup:
virCommandFree(cmd); virCommandFree(cmd);
return ret; return ret;
} }