shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-21 10:50:24 +03:00
Code Releases Activity

storageVolWipePattern: Don't take shortcut to refreshPool()

Browse Source 
In d16f803d780 we've tried to solve an issue that after wiping an
image its format might have changed (e.g. from qcow2 to raw) but
libvirt wasn't probing the image format. We fixed this by calling
virStorageBackendRefreshVolTargetUpdate() which is what
refreshPool() would end up calling. But this shortcut is not good
enough because the function is called only for local types of
volumes (like dir, fs, netfs). But now that more backends support
volume wiping we have to call the function with more caution.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2019-02-28 17:35:14 +01:00
parent f7b9d6f78b
commit 2e556e00ca
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/storage/storage_driver.c
View File

@ -2572,11 +2572,16 @@ storageVolWipePattern(virStorageVolPtr vol,
if (rc < 0)
goto cleanup;
/* Instead of using the refreshVol, since much changes on the target
* volume, let's update using the same function as refreshPool would
* use when it discovers a volume. The only failure to capture is -1,
* we can ignore -2. */
if (virStorageBackendRefreshVolTargetUpdate(voldef) == -1)
/* For local volumes, Instead of using the refreshVol, since
* much changes on the target volume, let's update using the
* same function as refreshPool would use when it discovers a
* volume. The only failure to capture is -1, we can ignore
* -2. */
if ((backend->type == VIR_STORAGE_POOL_DIR ||
backend->type == VIR_STORAGE_POOL_FS ||
backend->type == VIR_STORAGE_POOL_NETFS ||
backend->type == VIR_STORAGE_POOL_VSTORAGE) &&
virStorageBackendRefreshVolTargetUpdate(voldef) == -1)
goto cleanup;
ret = 0;