External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 19:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Improve error message when traversing backing chains

Browse Source 
Report also the name of the parent file and uid/gid used to access it to
help debugging broken storage configurations.
This commit is contained in:
Peter Krempa 2014-09-11 19:09:48 +02:00
parent 639a00984a
commit eaf43e3755
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/storage/storage_driver.c
View File

@ -2781,6 +2781,7 @@ virStorageFileChown(virStorageSourcePtr src,
/* Recursive workhorse for virStorageFileGetMetadata. */
static int
virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
virStorageSourcePtr parent,
uid_t uid, gid_t gid,
bool allow_probe,
bool report_broken,
@ -2805,9 +2806,18 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
return -1;
if (virStorageFileAccess(src, F_OK) < 0) {
virReportSystemError(errno,
_("Cannot access backing file %s"),
src->path);
if (src == parent) {
virReportSystemError(errno,
_("Cannot access storage file '%s' "
"(as uid:%d, gid:%d)"),
src->path, (int)uid, (int)gid);
} else {
virReportSystemError(errno,
_("Cannot access backing file '%s' "
"of storage file '%s' (as uid:%d, gid:%d)"),
src->path, parent->path, (int)uid, (int)gid);
}
goto cleanup;
}
@ -2848,7 +2858,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
else
backingStore->format = backingFormat;
if ((ret = virStorageFileGetMetadataRecurse(backingStore,
if ((ret = virStorageFileGetMetadataRecurse(backingStore, parent,
uid, gid,
allow_probe, report_broken,
cycle)) < 0) {
@ -2912,7 +2922,7 @@ virStorageFileGetMetadata(virStorageSourcePtr src,
if (src->format <= VIR_STORAGE_FILE_NONE)
src->format = allow_probe ? VIR_STORAGE_FILE_AUTO : VIR_STORAGE_FILE_RAW;
ret = virStorageFileGetMetadataRecurse(src, uid, gid,
ret = virStorageFileGetMetadataRecurse(src, src, uid, gid,
allow_probe, report_broken, cycle);
virHashFree(cycle);