mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 19:41:16 +00:00
One of the features of qcow2 is that a wrapper file can have more capacity than its backing file from the guest's perspective; what's more, sparse files make tracking allocation of both the active and backing file worthwhile. As such, it makes more sense to show allocation numbers for each file in a chain, and not just the top-level file. This sets up the fields for the tracking, although it does not modify XML to display any new information. * src/util/virstoragefile.h (_virStorageSource): Add fields. * src/conf/storage_conf.h (_virStorageVolDef): Drop redundant fields. * src/storage/storage_backend.c (virStorageBackendCreateBlockFrom) (createRawFile, virStorageBackendCreateQemuImgCmd) (virStorageBackendCreateQcowCreate): Update clients. * src/storage/storage_driver.c (storageVolDelete) (storageVolCreateXML, storageVolCreateXMLFrom, storageVolResize) (storageVolWipeInternal, storageVolGetInfo): Likewise. * src/storage/storage_backend_fs.c (virStorageBackendProbeTarget) (virStorageBackendFileSystemRefresh) (virStorageBackendFileSystemVolResize) (virStorageBackendFileSystemVolRefresh): Likewise. * src/storage/storage_backend_logical.c (virStorageBackendLogicalMakeVol) (virStorageBackendLogicalCreateVol): Likewise. * src/storage/storage_backend_scsi.c (virStorageBackendSCSINewLun): Likewise. * src/storage/storage_backend_mpath.c (virStorageBackendMpathNewVol): Likewise. * src/storage/storage_backend_rbd.c (volStorageBackendRBDRefreshVolInfo) (virStorageBackendRBDCreateImage): Likewise. * src/storage/storage_backend_disk.c (virStorageBackendDiskMakeDataVol) (virStorageBackendDiskCreateVol): Likewise. * src/storage/storage_backend_sheepdog.c (virStorageBackendSheepdogBuildVol) (virStorageBackendSheepdogParseVdiList): Likewise. * src/storage/storage_backend_gluster.c (virStorageBackendGlusterRefreshVol): Likewise. * src/conf/storage_conf.c (virStorageVolDefFormat) (virStorageVolDefParseXML): Likewise. * src/test/test_driver.c (testOpenVolumesForPool) (testStorageVolCreateXML, testStorageVolCreateXMLFrom) (testStorageVolDelete, testStorageVolGetInfo): Likewise. * src/esx/esx_storage_backend_iscsi.c (esxStorageVolGetXMLDesc): Likewise. * src/esx/esx_storage_backend_vmfs.c (esxStorageVolGetXMLDesc) (esxStorageVolCreateXML): Likewise. * src/parallels/parallels_driver.c (parallelsAddHddByVolume): Likewise. * src/parallels/parallels_storage.c (parallelsDiskDescParseNode) (parallelsStorageVolDefineXML, parallelsStorageVolCreateXMLFrom) (parallelsStorageVolDefRemove, parallelsStorageVolGetInfo): Likewise. * src/vbox/vbox_tmpl.c (vboxStorageVolCreateXML) (vboxStorageVolGetXMLDesc): Likewise. * tests/storagebackendsheepdogtest.c (test_vdi_list_parser): Likewise. * src/phyp/phyp_driver.c (phypStorageVolCreateXML): Likewise.
214 lines
5.6 KiB
C
214 lines
5.6 KiB
C
/*
|
|
* storagebackendsheepdogtest.c: storage backend for Sheepdog handling
|
|
*
|
|
* Copyright (C) 2014 Red Hat, Inc.
|
|
* Copyright (C) 2012 Sebastian Wiedenroth
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Author: Sebastian Wiedenroth <sebastian.wiedenroth@skylime.net>
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include "internal.h"
|
|
#include "testutils.h"
|
|
#include "storage/storage_backend_sheepdog.h"
|
|
#include "virstring.h"
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
typedef struct {
|
|
const char *output;
|
|
int expected_return;
|
|
uint64_t expected_capacity;
|
|
uint64_t expected_allocation;
|
|
} collie_test;
|
|
|
|
|
|
static int
|
|
test_node_info_parser(collie_test test, char *poolxml)
|
|
{
|
|
int ret = -1;
|
|
char *output = NULL;
|
|
char *poolXmlData = NULL;
|
|
virStoragePoolDefPtr pool = NULL;
|
|
|
|
if (virtTestLoadFile(poolxml, &poolXmlData) < 0)
|
|
goto cleanup;
|
|
|
|
if (!(pool = virStoragePoolDefParseString(poolXmlData)))
|
|
goto cleanup;
|
|
|
|
if (VIR_STRDUP(output, test.output) < 0)
|
|
goto cleanup;
|
|
|
|
if (virStorageBackendSheepdogParseNodeInfo(pool, output) !=
|
|
test.expected_return)
|
|
goto cleanup;
|
|
|
|
if (test.expected_return) {
|
|
ret = 0;
|
|
goto cleanup;
|
|
}
|
|
|
|
if (pool->capacity == test.expected_capacity &&
|
|
pool->allocation == test.expected_allocation)
|
|
ret = 0;
|
|
|
|
cleanup:
|
|
VIR_FREE(output);
|
|
VIR_FREE(poolXmlData);
|
|
virStoragePoolDefFree(pool);
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
test_vdi_list_parser(collie_test test, char *poolxml, char *volxml)
|
|
{
|
|
int ret = -1;
|
|
char *poolXmlData = NULL;
|
|
char *volXmlData = NULL;
|
|
char *output = NULL;
|
|
virStoragePoolDefPtr pool = NULL;
|
|
virStorageVolDefPtr vol = NULL;
|
|
|
|
if (virtTestLoadFile(poolxml, &poolXmlData) < 0)
|
|
goto cleanup;
|
|
if (virtTestLoadFile(volxml, &volXmlData) < 0)
|
|
goto cleanup;
|
|
|
|
if (!(pool = virStoragePoolDefParseString(poolXmlData)))
|
|
goto cleanup;
|
|
|
|
if (!(vol = virStorageVolDefParseString(pool, volXmlData)))
|
|
goto cleanup;
|
|
|
|
if (VIR_STRDUP(output, test.output) < 0)
|
|
goto cleanup;
|
|
|
|
if (virStorageBackendSheepdogParseVdiList(vol, output) !=
|
|
test.expected_return)
|
|
goto cleanup;
|
|
|
|
if (test.expected_return) {
|
|
ret = 0;
|
|
goto cleanup;
|
|
}
|
|
|
|
if (vol->target.capacity == test.expected_capacity &&
|
|
vol->target.allocation == test.expected_allocation)
|
|
ret = 0;
|
|
|
|
cleanup:
|
|
VIR_FREE(output);
|
|
VIR_FREE(poolXmlData);
|
|
VIR_FREE(volXmlData);
|
|
virStoragePoolDefFree(pool);
|
|
virStorageVolDefFree(vol);
|
|
return ret;
|
|
}
|
|
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = -1;
|
|
char *poolxml = NULL;
|
|
char *volxml = NULL;
|
|
|
|
collie_test node_info_tests[] = {
|
|
{"", -1, 0, 0},
|
|
{"Total 15245667872 117571104 0% 20972341\n", 0, 15245667872, 117571104},
|
|
{"To", -1, 0, 0},
|
|
{"asdf\nasdf", -1, 0, 0},
|
|
{"Total ", -1, 0, 0},
|
|
{"Total 1", -1, 0, 0},
|
|
{"Total 1\n", -1, 0, 0},
|
|
{"Total 1 ", -1, 0, 0},
|
|
{"Total 1 2", -1, 0, 0},
|
|
{"Total 1 2 ", -1, 0, 0},
|
|
{"Total 1 2\n", 0, 1, 2},
|
|
{"Total 1 2 \n", 0, 1, 2},
|
|
{"Total a 2 \n", -1, 0, 0},
|
|
{"Total 1 b \n", -1, 0, 0},
|
|
{"Total a b \n", -1, 0, 0},
|
|
{"stuff\nTotal 1 2 \n", 0, 1, 2},
|
|
{"0 1 2 3\nTotal 1 2 \n", 0, 1, 2},
|
|
{NULL, 0, 0, 0}
|
|
};
|
|
|
|
collie_test vdi_list_tests[] = {
|
|
{"", -1, 0, 0},
|
|
{"= test 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20},
|
|
{"= test\\ with\\ spaces 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20},
|
|
{"= backslashattheend\\\\ 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20},
|
|
{"s test 1 10 20 0 1336556634 7c2b25\n= test 3 50 60 0 1336557216 7c2b27\n", 0, 50, 60},
|
|
{"=", -1, 0, 0},
|
|
{"= test", -1, 0, 0},
|
|
{"= test ", -1, 0, 0},
|
|
{"= test 1", -1, 0, 0},
|
|
{"= test 1 ", -1, 0, 0},
|
|
{"= test 1 2", -1, 0, 0},
|
|
{"= test 1 2 ", -1, 0, 0},
|
|
{"= test 1 2 3", -1, 0, 0},
|
|
{NULL, 0, 0, 0}
|
|
};
|
|
|
|
collie_test *test = node_info_tests;
|
|
|
|
if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml",
|
|
abs_srcdir) < 0)
|
|
goto cleanup;
|
|
|
|
if (virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml",
|
|
abs_srcdir) < 0)
|
|
goto cleanup;
|
|
|
|
while (test->output != NULL) {
|
|
ret = test_node_info_parser(*test, poolxml);
|
|
virtTestResult("node_info_parser", ret, NULL);
|
|
++test;
|
|
if (ret < 0)
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
test = vdi_list_tests;
|
|
|
|
while (test->output != NULL) {
|
|
ret = test_vdi_list_parser(*test, poolxml, volxml);
|
|
virtTestResult("vdi_list_parser", ret, NULL);
|
|
++test;
|
|
if (ret < 0)
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
cleanup:
|
|
VIR_FREE(poolxml);
|
|
VIR_FREE(volxml);
|
|
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|