[libvirt] [PATCH] virsh: Checking the volume capacity before uploading a new file.

[Peter Krempa]

On Sun, Jan 07, 2018 at 21:31:24 -0200, Julio Faracco wrote:
> The current command 'vol-upload' is not checking if the volume accepts 
> a file bigger than its capacity. It can cause an interrupt of the 
> upload stream. This commit adds a check that fails before starting to 
> send new file to volume if the file is bigger.
> 
> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1529059
> 
> Signed-off-by: Julio Faracco <jcfaracco at gmail.com>
> ---
>  tools/virsh-volume.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
> index 8265a39..1359dba 100644
> --- a/tools/virsh-volume.c
> +++ b/tools/virsh-volume.c
> @@ -672,6 +672,7 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd)
>  {
>      const char *file = NULL;
>      virStorageVolPtr vol = NULL;
> +    virStorageVolInfo volumeInfo;
>      bool ret = false;
>      int fd = -1;
>      virStreamPtr st = NULL;
> @@ -701,6 +702,9 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd)
>      cbData.ctl = ctl;
>      cbData.fd = fd;
>  
> +    if (virStorageVolGetInfo(vol, &volumeInfo) < 0)
> +        goto cleanup;
> +
>      if (vshCommandOptBool(cmd, "sparse"))
>          flags |= VIR_STORAGE_VOL_UPLOAD_SPARSE_STREAM;
>  
> @@ -709,6 +713,11 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd)
>          goto cleanup;
>      }
>  
> +    if (volumeInfo.capacity <= virFileLength(file, fd)) {

I'm not sure that checking whether it's "equal" is a great idea.
Especially since it should exactly fit in that case.

> +        vshError(ctl, _("file is bigger than volume %s capacity"), name);
> +        goto cleanup;
> +    }
> +
>      if (virStorageVolUpload(vol, st, offset, length, flags) < 0) {
>          vshError(ctl, _("cannot upload to volume %s"), name);
>          goto cleanup;
> -- 
> 2.7.4
> 
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20180108/841ea8c0/attachment-0001.sig>