[pve-devel] [PATCH container v2] lxc: resize: fix #2790 return message in case of disk already at size

[pve-devel] [PATCH container v2] lxc: resize: fix #2790 return message in case of disk already at size

[Aaron Lauterer]

Otherwise the API would return an error message because returning an
empty value is not defined in the API.

By dying we avoid confusions as the return will be an error and not a
successful call which should return a task ID.

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
v1 -> v2: change from return to die as the result of the feedback to the
first version [0]

We should probably align the resize endpoint on the qemu side
accordingly as right now it has no return values defined at all and does
not return anything in this case.

[0] https://lists.proxmox.com/pipermail/pve-devel/2020-August/044597.html

 src/PVE/API2/LXC.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 21899d0..ced3093 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -1674,7 +1674,7 @@ __PACKAGE__->register_method({
 
 	    die "unable to shrink disk size\n" if $newsize < $size;
 
-	    return if $size == $newsize;
+	    die "disk is already at specified size\n" if $size == $newsize;
 
 	    PVE::Cluster::log_msg('info', $authuser, "update CT $vmid: resize --disk $disk --size $sizestr");
 	    my $realcmd = sub {
-- 
2.20.1

[pve-devel] applied: [PATCH container v2] lxc: resize: fix #2790 return message in case of disk already at size

[Thomas Lamprecht]

On 26.08.20 10:51, Aaron Lauterer wrote:
> Otherwise the API would return an error message because returning an
> empty value is not defined in the API.
> 
> By dying we avoid confusions as the return will be an error and not a
> successful call which should return a task ID.
> 
> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
> ---
> v1 -> v2: change from return to die as the result of the feedback to the
> first version [0]
> 
> We should probably align the resize endpoint on the qemu side
> accordingly as right now it has no return values defined at all and does
> not return anything in this case.
> 
> [0] https://lists.proxmox.com/pipermail/pve-devel/2020-August/044597.html
> 
>  src/PVE/API2/LXC.pm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied, thanks!