On 18.06.21 12:59, Fabian Ebner wrote:
> migration will no longer work when the storage's content type is not correct,
> and unreferenced volumes on such storages will not be scanned for anymore.
>
> Signed-off-by: Fabian Ebner <f.eb...@proxmox.com>
> ---
>
> If Lorenz's patches that enforce the correct content type on guest startup
> are applied, the warning message should be extended/generalised here of
> course.
>
at least the container ones are applied now, and this needs a rebase anyway
as the description length check was applied in-between.
> PVE/CLI/pve6to7.pm | 42 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm
> index fc779e4f..3e8af0a0 100644
> --- a/PVE/CLI/pve6to7.pm
> +++ b/PVE/CLI/pve6to7.pm
> @@ -660,6 +660,47 @@ sub check_custom_pool_roles {
> }
> }
>
> +sub check_storage_content {
> + log_info("Scanning for guest images on storages without images/rootdir
> content type..");
> +
> + my $found;
> +
> + my $storage_cfg = PVE::Storage::config();
> +
> + for my $storeid (keys $storage_cfg->{ids}->%*) {
> + my $scfg = $storage_cfg->{ids}->{$storeid};
> +
> + next if !PVE::Storage::storage_check_enabled($storage_cfg, $storeid,
> undef, 1);
> +
> + next if $scfg->{content}->{images};
> + next if $scfg->{content}->{rootdir};
> +
> + # Skip 'iscsi(direct)' (and foreign plugins with potentially similiar
> behavior) with 'none',
> + # because that means "use LUNs directly" and vdisk_list() in PVE 6.x
> still lists those.
> + # It's enough to *not* skip 'dir', because it is the only other storage
> that supports 'none'
> + # and 'images' or 'rootdir', hence being potentially misconfigured.
> + next if $scfg->{type} ne 'dir' && $scfg->{content}->{none};
> +
> + my $res = PVE::Storage::vdisk_list($storage_cfg, $storeid);
> + my $disk_list = $res->{$storeid};
> +
> + my @volumes = map { $_->{volid} } $disk_list->@*;
> +
> + if (scalar(@volumes) > 0) {
> + $found = 1;
> + log_warn("storage '$storeid' - neither content type 'images' nor
> 'rootdir' " .
> + "configured, but found guest volume(s) " . join(',', @volumes));
> + }
> + }
> +
> + if ($found) {
> + log_warn("PVE 7.0 enforces stricter content type checks on migration,
> so migrating " .
> + "guests referencing those volumes will not work anymore.");
> + } else {
> + log_pass("none found");
> + }
> +}
> +
> sub check_misc {
> print_header("MISCELLANEOUS CHECKS");
> my $ssh_config = eval {
> PVE::Tools::file_get_contents('/root/.ssh/config') };
> @@ -753,6 +794,7 @@ sub check_misc {
> check_backup_retention_settings();
> check_cifs_credential_location();
> check_custom_pool_roles();
> + check_storage_content();
> }
>
> __PACKAGE__->register_method ({
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
