> Alexandre Derumier via pve-devel <pve-devel@lists.proxmox.com> hat am
> 16.12.2024 10:12 CET geschrieben:
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> This was a limitation of drive-mirror, blockdev mirror is able
> to reopen image with a different aio
>
> Signed-off-by: Alexandre Derumier <alexandre.derum...@groupe-cyllene.com>
> ---
> PVE/QemuServer.pm | 41 ++++++++++-------------------------------
> 1 file changed, 10 insertions(+), 31 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 3d7c41ee..dc12b38f 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -8207,8 +8207,16 @@ sub qemu_drive_mirror {
> $dst_drive->{format} = $dst_format;
> $dst_drive->{file} = $dst_path;
> $dst_drive->{zeroinit} = 1 if $is_zero_initialized;
> - #improve: if target storage don't support aio uring,change it to default
> native
> - #and remove clone_disk_check_io_uring()
> +
> + #change aio if io_uring is not supported on target
> + if ($dst_drive->{aio} && $dst_drive->{aio} eq 'io_uring') {
> + my ($dst_storeid) = PVE::Storage::parse_volume_id($dst_drive->{file});
> + my $dst_scfg = PVE::Storage::storage_config($storecfg, $dst_storeid);
> + my $cache_direct = drive_uses_cache_direct($dst_drive, $dst_scfg);
> + if(!storage_allows_io_uring_default($dst_scfg, $cache_direct)) {
> + $dst_drive->{aio} = $cache_direct ? 'native' : 'threads';
> + }
> + }
couldn't/shouldn't we just handle this in generate_file_blockdev?
>
> #add new block device
> my $nodes = get_blockdev_nodes($vmid);
> @@ -8514,33 +8522,6 @@ sub qemu_drive_mirror_switch_to_active_mode {
> }
> }
>
> -# Check for bug #4525: drive-mirror will open the target drive with the same
> aio setting as the
> -# source, but some storages have problems with io_uring, sometimes even
> leading to crashes.
> -my sub clone_disk_check_io_uring {
> - my ($src_drive, $storecfg, $src_storeid, $dst_storeid,
> $use_drive_mirror) = @_;
> -
> - return if !$use_drive_mirror;
> -
> - # Don't complain when not changing storage.
> - # Assume if it works for the source, it'll work for the target too.
> - return if $src_storeid eq $dst_storeid;
> -
> - my $src_scfg = PVE::Storage::storage_config($storecfg, $src_storeid);
> - my $dst_scfg = PVE::Storage::storage_config($storecfg, $dst_storeid);
> -
> - my $cache_direct = drive_uses_cache_direct($src_drive);
> -
> - my $src_uses_io_uring;
> - if ($src_drive->{aio}) {
> - $src_uses_io_uring = $src_drive->{aio} eq 'io_uring';
> - } else {
> - $src_uses_io_uring = storage_allows_io_uring_default($src_scfg,
> $cache_direct);
> - }
> -
> - die "target storage is known to cause issues with aio=io_uring (used by
> current drive)\n"
> - if $src_uses_io_uring && !storage_allows_io_uring_default($dst_scfg,
> $cache_direct);
> -}
> -
> sub clone_disk {
> my ($storecfg, $source, $dest, $full, $newvollist, $jobs, $completion,
> $qga, $bwlimit) = @_;
>
> @@ -8598,8 +8579,6 @@ sub clone_disk {
> $dst_format = 'raw';
> $size = PVE::QemuServer::Drive::TPMSTATE_DISK_SIZE;
> } else {
> - clone_disk_check_io_uring($drive, $storecfg, $src_storeid,
> $storeid, $use_drive_mirror);
> -
> $size = PVE::Storage::volume_size_info($storecfg, $drive->{file},
> 10);
> }
> $newvolid = PVE::Storage::vdisk_alloc(
> --
> 2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
