[pve-devel] applied: [PATCH manager 2/2] 5to6: add check for scanned simple OSDs

[Thomas Lamprecht]

On 6/27/19 9:02 PM, Fabian Grünbichler wrote:
> only as a warning, since this will also trigger a Ceph health warning
> and is easily recoverable.
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> ---
>  PVE/CLI/pve5to6.pm | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/PVE/CLI/pve5to6.pm b/PVE/CLI/pve5to6.pm
> index 98b35594..a0af4f01 100644
> --- a/PVE/CLI/pve5to6.pm
> +++ b/PVE/CLI/pve5to6.pm
> @@ -360,6 +360,18 @@ sub check_ceph {
>  	    log_warn("overall version mismatch detected, check 'ceph versions' output for details!");
>  	}
>      }
> +
> +    my $local_ceph_ver = PVE::Ceph::Tools::get_local_version(1);
> +    if (defined($local_ceph_ver)) {
> +	if ($local_ceph_ver == 14) {
> +	    my $scanned_osds = PVE::Tools::dir_glob_regex('/etc/ceph/osd', '^.*\.json$');
> +	    if (-e '/var/lib/ceph/osd/' && !defined($scanned_osds)) {
> +		log_warn("local Ceph version is Nautilus, local OSDs detected, but no conversion from ceph-disk to ceph-volume done (yet).");
> +	    }
> +	}
> +    } else {
> +	log_fail("unable to determine local Ceph version.");
> +    }
>  }
>  
>  sub check_misc {
> 

applied