This patch implements the same feature as qm 'rescan'. Changes v1 -> v2: - removed options - improved namings
Signed-off-by: Alwin Antreich <[email protected]> --- src/PVE/CLI/pct.pm | 34 ++++++++++++ src/PVE/LXC.pm | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+) diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm index 9d3a230..794bc45 100755 --- a/src/PVE/CLI/pct.pm +++ b/src/PVE/CLI/pct.pm @@ -468,6 +468,39 @@ sub create_file { return $fd; } +__PACKAGE__->register_method ({ + name => 'rescan', + path => 'rescan', + method => 'POST', + description => "Rescan all storages and update disk sizes and unused disk images.", + parameters => { + additionalProperties => 0, + properties => { + vmid => get_standard_option('pve-vmid', { + optional => 1, + completion => \&PVE::LXC::complete_ctid, + }), + dryrun => { + type => 'boolean', + optional => 1, + default => 0, + description => 'Do not actually write changes out to conifg.', + }, + }, + }, + returns => { type => 'null'}, + code => sub { + my ($param) = @_; + + my $dryrun = $param->{dryrun}; + + print "NOTE: running in dry-run mode, won't write changes out!\n" if $dryrun; + + PVE::LXC::rescan($param->{vmid}, 0, $dryrun); + + return undef; + }}); + __PACKAGE__->register_method({ name => 'pull', path => 'pull', @@ -781,6 +814,7 @@ our $cmddef = { pull => [ __PACKAGE__, 'pull', ['vmid', 'path', 'destination']], df => [ __PACKAGE__, 'df', ['vmid']], + rescan => [ __PACKAGE__, 'rescan', []], destroy => [ 'PVE::API2::LXC', 'destroy_vm', ['vmid'], { node => $nodename }, $upid_exit ], diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 0f2aa5c..7ec963f 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1638,6 +1638,154 @@ sub create_disks { return $vollist; } +sub update_disksize { + my ($vmid, $conf, $all_volumes) = @_; + + my $changes; + my $prefix = "CT $vmid:"; + + my $update_mp = sub { + my ($key, $mp, @param) = @_; + my $size = $all_volumes->{$mp->{volume}}->{size}; + + if ($size != $mp->{size}) { + $changes = 1; + print "$prefix updated volume size of '$mp->{volume}' in config.\n"; + $mp->{size} = $size; + } + + my $nomp = 1 if ($key eq 'rootfs'); + $conf->{$key} = PVE::LXC::Config->print_ct_mountpoint($mp, $nomp); + }; + + PVE::LXC::Config->foreach_mountpoint($conf, $update_mp); + + return $changes; + +} + +sub update_unused { + my ($vmid, $conf, $all_volumes) = @_; + + my $changes; + my $prefix = "CT $vmid:"; + + # Note: it is allowed to define multiple storage entries with the same path + # (alias), so we need to check both 'volid' and real 'path' (two different + # volid can point to the same path). + + # used and unused disks + my $refpath = {}; + my $referenced = {}; + + foreach my $opt (keys %$conf) { + next if ($opt !~ m/^unused\d+$/); + my $vol = $all_volumes->{$conf->{$opt}}; + $refpath->{$vol->{path}} = $vol->{volid}; + } + + foreach my $key (keys %$all_volumes) { + my $vol = $all_volumes->{$key}; + my $in_use = PVE::LXC::Config->is_volume_in_use($conf, $vol->{volid}); + my $path = $vol->{path}; + + if ($in_use) { + $refpath->{$path} = $key; + delete $referenced->{$path}; + } else { + if ((!$referenced->{$path}) && (!$refpath->{$path})) { + $referenced->{$path} = $key; + } + } + + } + + for my $key (keys %$referenced) { + my $disk = $referenced->{$key}; + my $unused = PVE::LXC::Config->add_unused_volume($conf, $disk); + + if ($unused) { + $changes = 1; + print "$prefix add unreferenced volume '$disk' as '$unused' to config.\n"; + } + } + + return $changes; + +} + +sub scan_volids { + my ($cfg, $vmid) = @_; + + my $info = PVE::Storage::vdisk_list($cfg, undef, $vmid); + + my $all_volumes = {}; + foreach my $storeid (keys %$info) { + foreach my $item (@{$info->{$storeid}}) { + my $volid = $item->{volid}; + next if !($volid && $item->{size}); + $item->{path} = PVE::Storage::path($cfg, $volid); + $all_volumes->{$volid} = $item; + } + } + + return $all_volumes; +} + +sub rescan { + my ($vmid, $nolock, $dryrun) = @_; + + my $cfg = PVE::Storage::config(); + + # FIXME: Remove once our RBD plugin can handle CT and VM on a single storage + # see: https://pve.proxmox.com/pipermail/pve-devel/2018-July/032900.html + foreach my $stor (keys %{$cfg->{ids}}) { + delete($cfg->{ids}->{$stor}) if !$cfg->{ids}->{$stor}->{content}->{rootdir}; + } + + print "rescan volumes...\n"; + my $all_volumes = scan_volids($cfg, $vmid); + + my $updatefn = sub { + my ($vmid) = @_; + + my $changes; + my $conf = PVE::LXC::Config->load_config($vmid); + + PVE::LXC::Config->check_lock($conf); + + my $vm_volids = {}; + foreach my $volid (keys %$all_volumes) { + my $info = $all_volumes->{$volid}; + $vm_volids->{$volid} = $info if $info->{vmid} == $vmid; + } + + my $upu = update_unused($vmid, $conf, $vm_volids); + my $upd = update_disksize($vmid, $conf, $vm_volids); + $changes = $upu || $upd; + + PVE::LXC::Config->write_config($vmid, $conf) if $changes && !$dryrun; + }; + + if (defined($vmid)) { + if ($nolock) { + &$updatefn($vmid); + } else { + PVE::LXC::Config->lock_config($vmid, $updatefn, $vmid); + } + } else { + my $vmlist = config_list(); + foreach my $vmid (keys %$vmlist) { + if ($nolock) { + &$updatefn($vmid); + } else { + PVE::LXC::Config->lock_config($vmid, $updatefn, $vmid); + } + } + } +} + + # bash completion helper sub complete_os_templates { -- 2.11.0 _______________________________________________ pve-devel mailing list [email protected] https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
