[pve-devel] [PATCH] qm : add resize

[Alexandre DERUMIER]

yes, main part copy/paste from updatedisk, to avoid to miss permission check but I have tested it succefully.
I'll retested it today (and compare with my code to see what I miss)

Thanks!



----- Mail original ----- 

De: "Dietmar Maurer" <dietmar at proxmox.com> 
À: "Alexandre Derumier" <aderumier at odiso.com>, pve-devel at pve.proxmox.com 
Envoyé: Mercredi 8 Août 2012 09:49:52 
Objet: RE: [pve-devel] [PATCH] qm : add resize 

Well, this patch look like cut/paste, without any testing? 

I committed, but rewrote large parts. 

Please review new code and test. 

- Dietmar 

> -----Original Message----- 
> From: pve-devel-bounces at pve.proxmox.com [mailto:pve-devel- 
> bounces at pve.proxmox.com] On Behalf Of Alexandre Derumier 
> Sent: Dienstag, 07. August 2012 12:05 
> To: pve-devel at pve.proxmox.com 
> Subject: [pve-devel] [PATCH] qm : add resize 
> 
> qm resize <vmid> -ide1 +10(G|M|K) 
> 
> Signed-off-by: Alexandre Derumier <aderumier at odiso.com> 
> --- 
> PVE/API2/Qemu.pm | 122 
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
> qm | 2 + 
> 2 files changed, 124 insertions(+), 0 deletions(-) 
> 
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 
> 47c588f..3927360 100644 
> --- a/PVE/API2/Qemu.pm 
> +++ b/PVE/API2/Qemu.pm 
> @@ -728,6 +728,47 @@ my $vmconfig_update_disk = sub { 
> } 
> }; 
> 
> +my $vmconfig_resize_disk = sub { 
> + my ($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $value, 
> +$force) = @_; 
> + 
> + my $drive = PVE::QemuServer::parse_drive($opt, $value); 
> + 
> + if (PVE::QemuServer::drive_is_cdrom($drive)) { #cdrom 
> + die "you can't resize a cdrom"; 
> + } else { 
> + $rpcenv->check_vm_perm($authuser, $vmid, undef, 
> ['VM.Config.Disk']); 
> + } 
> + 
> + if ($conf->{$opt}) { 
> + 
> + if (my $drive = PVE::QemuServer::parse_drive($opt, $conf->{$opt})) { 
> + my $volid = $drive->{file}; 
> + my $size = PVE::Storage::volume_size_info($storecfg, $volid, 1); 
> + if ($value =~ m/^\+([1-9]\d*(\.\d+)?)([KMG])?$/){ 
> + my ($sizeextent, $unit) = ($1, $3); 
> + if ($unit) { 
> + if ($unit eq 'K') { 
> + $sizeextent = $sizeextent * 1024; 
> + } elsif ($unit eq 'M') { 
> + $sizeextent = $sizeextent * 1024 * 1024; 
> + } elsif ($unit eq 'G') { 
> + $sizeextent = $sizeextent * 1024 * 1024 * 1024; 
> + } 
> + } 
> + 
> + my $targetsize = $size + int($sizeextent); 
> + PVE::QemuServer::qemu_block_resize($vmid, "drive-$opt", 
> $storecfg, $drive->{file}, $targetsize); 
> + my $newsize = PVE::Storage::volume_size_info($storecfg, $volid, 1); 
> + $drive->{size} = $newsize; 
> + $conf->{$opt} = PVE::QemuServer::print_drive($vmid, 
> + $drive); 
> + 
> + PVE::QemuServer::update_config_nolock($vmid, $conf, 1); 
> + } 
> + } 
> + } 
> + 
> +}; 
> + 
> my $vmconfig_update_net = sub { 
> my ($rpcenv, $authuser, $conf, $storecfg, $vmid, $opt, $value) = @_; 
> 
> @@ -1749,4 +1790,85 @@ __PACKAGE__->register_method({ 
> return $res; 
> }}); 
> 
> +__PACKAGE__->register_method({ 
> + name => 'resize_vm', 
> + path => '{vmid}/config', 
> + method => 'PUT', 
> + protected => 1, 
> + proxyto => 'node', 
> + description => "extend volume size.", 
> + permissions => { 
> + check => ['perm', '/vms/{vmid}', $vm_config_perm_list, any => 1], 
> + }, 
> + parameters => { 
> + additionalProperties => 0, 
> + properties => PVE::QemuServer::json_config_properties( 
> + { 
> + node => get_standard_option('pve-node'), 
> + vmid => get_standard_option('pve-vmid'), 
> + skiplock => get_standard_option('skiplock'), 
> + digest => { 
> + type => 'string', 
> + description => 'Prevent changes if current configuration file has 
> different SHA1 digest. This can be used to prevent concurrent modifications.', 
> + maxLength => 40, 
> + optional => 1, 
> + } 
> + }), 
> + }, 
> + returns => { type => 'null'}, 
> + code => sub { 
> + my ($param) = @_; 
> + 
> + my $rpcenv = PVE::RPCEnvironment::get(); 
> + 
> + my $authuser = $rpcenv->get_user(); 
> + 
> + my $node = extract_param($param, 'node'); 
> + 
> + my $vmid = extract_param($param, 'vmid'); 
> + 
> + my $digest = extract_param($param, 'digest'); 
> + 
> + my @paramarr = (); # used for log message 
> + foreach my $key (keys %$param) { 
> + push @paramarr, "-$key", $param->{$key}; 
> + } 
> + 
> + my $skiplock = extract_param($param, 'skiplock'); 
> + raise_param_exc({ skiplock => "Only root may use this option." }) 
> + if $skiplock && $authuser ne 'root at pam'; 
> + 
> + my $force = extract_param($param, 'force'); 
> + 
> + die "no options specified\n" if !scalar(keys %$param); 
> + 
> + my $storecfg = PVE::Storage::config(); 
> + 
> + 
> + &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, undef, 
> + [keys %$param]); 
> + 
> + &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, 
> + $param); 
> + 
> + my $updatefn = sub { 
> + 
> + my $conf = PVE::QemuServer::load_config($vmid); 
> + 
> + die "checksum missmatch (file change by other user?)\n" 
> + if $digest && $digest ne $conf->{digest}; 
> + PVE::QemuServer::check_lock($conf) if !$skiplock; 
> + 
> + PVE::Cluster::log_msg('info', $authuser, "update VM $vmid: 
> + " . join (' ', @paramarr)); 
> + 
> + foreach my $opt (keys %$param) { # add/change 
> + if (PVE::QemuServer::valid_drivename($opt)) { 
> + &$vmconfig_resize_disk($rpcenv, $authuser, $conf, $storecfg, 
> $vmid, $opt, $param->{$opt}, $force); 
> + } 
> + } 
> + 
> + }; 
> + 
> + PVE::QemuServer::lock_config($vmid, $updatefn); 
> + return undef; 
> + }}); 
> + 
> 1; 
> diff --git a/qm b/qm 
> index b5b35de..0290ba1 100755 
> --- a/qm 
> +++ b/qm 
> @@ -332,6 +332,8 @@ my $cmddef = { 
> 
> set => [ "PVE::API2::Qemu", 'update_vm', ['vmid'], { node => $nodename } 
> ], 
> 
> + resize => [ "PVE::API2::Qemu", 'resize_vm', ['vmid'], { node => 
> + $nodename } ], 
> + 
> unlink => [ "PVE::API2::Qemu", 'unlink', ['vmid', 'idlist'], { node => 
> $nodename } ], 
> 
> config => [ "PVE::API2::Qemu", 'vm_config', ['vmid'], 
> -- 
> 1.7.2.5 
> 
> _______________________________________________ 
> pve-devel mailing list 
> pve-devel at pve.proxmox.com 
> http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel 





-- 

-- 



	

Alexandre D e rumier 

Ingénieur Systèmes et Réseaux 


Fixe : 03 20 68 88 85 

Fax : 03 20 68 90 88 


45 Bvd du Général Leclerc 59100 Roubaix 
12 rue Marivaux 75002 Paris