External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: improve directory support in gluster pool

Browse Source 
Take advantage of the previous patch's addition of 'netdir' as
a distinct volume type, to expose rather than silently skip
directories embedded in a gluster pool.  Also serves as an XML
validation for the previous patch.

* src/storage/storage_backend_gluster.c
(virStorageBackendGlusterRefreshVol): Don't skip directories.
* tests/storagevolxml2xmltest.c (mymain): Add test.
* tests/storagevolxml2xmlin/vol-gluster-dir.xml: New file.
* tests/storagevolxml2xmlout/vol-gluster-dir.xml: Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2013-11-20 13:17:55 -07:00
parent ecd881b7a7
commit 1458b2e963
4 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/storage/storage_backend_gluster.c
View File

@ -165,9 +165,6 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
/* Silently skip '.' and '..'. */ /* Silently skip '.' and '..'. */
if (STREQ(name, ".") || STREQ(name, "..")) if (STREQ(name, ".") || STREQ(name, ".."))
return 0; return 0;
/* FIXME: support directories. For now, silently skip them. */
if (S_ISDIR(st->st_mode))
return 0;
if (VIR_ALLOC(vol) < 0) if (VIR_ALLOC(vol) < 0)
goto cleanup; goto cleanup;
@ -177,7 +174,6 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
vol->name) < 0) vol->name) < 0)
goto cleanup; goto cleanup;
vol->type = VIR_STORAGE_VOL_NETWORK;
tmp = state->uri->path; tmp = state->uri->path;
state->uri->path = vol->key; state->uri->path = vol->key;
if (!(vol->target.path = virURIFormat(state->uri))) { if (!(vol->target.path = virURIFormat(state->uri))) {
@ -186,7 +182,17 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
} }
state->uri->path = tmp; state->uri->path = tmp;
if (S_ISDIR(st->st_mode)) {
vol->type = VIR_STORAGE_VOL_NETDIR;
vol->target.format = VIR_STORAGE_FILE_DIR;
*volptr = vol;
vol = NULL;
ret = 0;
goto cleanup;
}
/* FIXME - must open files to determine if they are non-raw */ /* FIXME - must open files to determine if they are non-raw */
vol->type = VIR_STORAGE_VOL_NETWORK;
vol->target.format = VIR_STORAGE_FILE_RAW; vol->target.format = VIR_STORAGE_FILE_RAW;
vol->capacity = vol->allocation = st->st_size; vol->capacity = vol->allocation = st->st_size;

12
tests/storagevolxml2xmlin/vol-gluster-dir.xml Normal file
View File

@ -0,0 +1,12 @@
<volume type='netdir'>
<name>dir</name>
<key>vol/dir</key>
<source>
</source>
<capacity unit='bytes'>0</capacity>
<allocation unit='bytes'>0</allocation>
<target>
<format type='dir'/>
<path>gluster://example.com/vol/dir</path>
</target>
</volume>

17
tests/storagevolxml2xmlout/vol-gluster-dir.xml Normal file
View File

@ -0,0 +1,17 @@
<volume type='netdir'>
<name>dir</name>
<key>vol/dir</key>
<source>
</source>
<capacity unit='bytes'>0</capacity>
<allocation unit='bytes'>0</allocation>
<target>
<path>gluster://example.com/vol/dir</path>
<format type='dir'/>
<permissions>
<mode>0600</mode>
<owner>4294967295</owner>
<group>4294967295</group>
</permissions>
</target>
</volume>

1
tests/storagevolxml2xmltest.c
View File

@ -121,6 +121,7 @@ mymain(void)
DO_TEST("pool-logical", "vol-logical"); DO_TEST("pool-logical", "vol-logical");
DO_TEST("pool-logical", "vol-logical-backing"); DO_TEST("pool-logical", "vol-logical-backing");
DO_TEST("pool-sheepdog", "vol-sheepdog"); DO_TEST("pool-sheepdog", "vol-sheepdog");
DO_TEST("pool-gluster", "vol-gluster-dir");
return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }