[libvirt] [PATCH] storage: zfs: implement pool build and delete
Provide an implementation for buildPool and deletePool operations for the ZFS storage backend. --- docs/schemas/storagepool.rng | 1 + src/storage/storage_backend_zfs.c | 57 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 908cc11..da8e1f3 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -386,6 +386,7 @@ <element name='source'> <interleave> <ref name='sourceinfoname'/> + <ref name='sourceinfodev'/> </interleave> </element> </define> diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index d8201ac..9482706 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -325,6 +325,61 @@ virStorageBackendZFSDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, return ret; } +static int +virStorageBackendZFSBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + unsigned int flags) +{ + virCommandPtr cmd = NULL; + size_t i; + int ret = -1; + + virCheckFlags(0, -1); + + if (pool->def->source.ndevice == 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("missing source devices")); + return -1; + } + + cmd = virCommandNewArgList(ZPOOL, "create", + pool->def->source.name, NULL); + + for (i = 0; i < pool->def->source.ndevice; i++) + virCommandAddArg(cmd, pool->def->source.devices[i].path); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virCommandFree(cmd); + return ret; +} + +static int +virStorageBackendZFSDeletePool(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + unsigned int flags) +{ + virCommandPtr cmd = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + cmd = virCommandNewArgList(ZPOOL, "destroy", + pool->def->source.name, NULL); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virCommandFree(cmd); + return ret; +} virStorageBackend virStorageBackendZFS = { .type = VIR_STORAGE_POOL_ZFS, @@ -333,6 +388,8 @@ virStorageBackend virStorageBackendZFS = { .refreshPool = virStorageBackendZFSRefreshPool, .createVol = virStorageBackendZFSCreateVol, .deleteVol = virStorageBackendZFSDeleteVol, + .buildPool = virStorageBackendZFSBuildPool, + .deletePool = virStorageBackendZFSDeletePool, .uploadVol = virStorageBackendVolUploadLocal, .downloadVol = virStorageBackendVolDownloadLocal, }; -- 2.0.2
On 09/07/2014 04:15 PM, Roman Bogorodskiy wrote:
Provide an implementation for buildPool and deletePool operations for the ZFS storage backend. --- docs/schemas/storagepool.rng | 1 + src/storage/storage_backend_zfs.c | 57 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+)
ACK.
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 908cc11..da8e1f3 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -386,6 +386,7 @@ <element name='source'> <interleave> <ref name='sourceinfoname'/> + <ref name='sourceinfodev'/> </interleave> </element> </define>
It would be nice to add an example to docs/formatstorage.html or storage.html. Also an XML to the test suite to check its validity against the RNG schema. Jan
Ján Tomko wrote:
On 09/07/2014 04:15 PM, Roman Bogorodskiy wrote:
Provide an implementation for buildPool and deletePool operations for the ZFS storage backend. --- docs/schemas/storagepool.rng | 1 + src/storage/storage_backend_zfs.c | 57 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+)
ACK.
Thanks; will push closer to the weekend.
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 908cc11..da8e1f3 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -386,6 +386,7 @@ <element name='source'> <interleave> <ref name='sourceinfoname'/> + <ref name='sourceinfodev'/> </interleave> </element> </define>
It would be nice to add an example to docs/formatstorage.html or storage.html. Also an XML to the test suite to check its validity against the RNG schema.
Yes, that's true; added to my todo list. Also, I think it'd be good to add a domain xml example to the bhyve driver page and ideally create some unit tests for the ZFS backend code. Roman Bogorodskiy
Roman Bogorodskiy wrote:
Ján Tomko wrote:
On 09/07/2014 04:15 PM, Roman Bogorodskiy wrote:
Provide an implementation for buildPool and deletePool operations for the ZFS storage backend. --- docs/schemas/storagepool.rng | 1 + src/storage/storage_backend_zfs.c | 57 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+)
ACK.
Thanks; will push closer to the weekend.
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 908cc11..da8e1f3 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -386,6 +386,7 @@ <element name='source'> <interleave> <ref name='sourceinfoname'/> + <ref name='sourceinfodev'/> </interleave> </element> </define>
It would be nice to add an example to docs/formatstorage.html or storage.html. Also an XML to the test suite to check its validity against the RNG schema.
Yes, that's true; added to my todo list.
Also, I think it'd be good to add a domain xml example to the bhyve driver page and ideally create some unit tests for the ZFS backend code.
I decided to add a test before pushing to make sure that everything is right and... here's a result, I've found some minor problems. So I've rolled a v2 with the tests included and issues fixed: http://www.redhat.com/archives/libvir-list/2014-September/msg00829.html Should not be lazy to add tests first as they do the job. Roman Bogorodskiy
participants (2)
-
Ján Tomko -
Roman Bogorodskiy