all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
	Stefan Reiter <s.reiter@proxmox.com>,
	pbs-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH qemu-server 07/11] cfg2cmd: allow PBS snapshots as backing files for drives
Date: Thu, 28 Jan 2021 17:25:33 +0100	[thread overview]
Message-ID: <246fec98-7324-7af5-5cd4-e2ef539b287a@proxmox.com> (raw)
In-Reply-To: <20210111111409.32385-8-s.reiter@proxmox.com>

On 11.01.21 12:14, Stefan Reiter wrote:
> Uses the custom 'alloc-track' filter node to redirect writes to the
> original drives target, while unwritten blocks will be read from the
> specified PBS snapshot.
> 
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>  PVE/QemuServer.pm | 42 +++++++++++++++++++++++++++++++++++++++---
>  1 file changed, 39 insertions(+), 3 deletions(-)
> 
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index d517dae..6de6ff6 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -3022,7 +3022,8 @@ sub query_understood_cpu_flags {
>  }
>  
>  sub config_to_command {
> -    my ($storecfg, $vmid, $conf, $defaults, $forcemachine, $forcecpu) = @_;
> +    my ($storecfg, $vmid, $conf, $defaults, $forcemachine, $forcecpu,
> +        $pbs_backing) = @_;
>  
>      my $cmd = [];
>      my $globalFlags = [];
> @@ -3521,6 +3522,32 @@ sub config_to_command {
>  	my $drive_cmd = print_drive_commandline_full($storecfg, $vmid, $drive);
>  	$drive_cmd .= ',readonly' if PVE::QemuConfig->is_template($conf);
>  
> +	if ($pbs_backing && defined($pbs_backing->{$ds})) {

please avoid extending config_to_command to much, move to own method.

> +	    my $pbs_conf = $pbs_backing->{$ds};
> +	    my $pbs_name = "drive-$ds-pbs";
> +
> +	    # add PBS block device to access snapshot from QEMU
> +	    my $blockdev = "driver=pbs,node-name=$pbs_name,read-only=on";
> +	    $blockdev .= ",repository=$pbs_conf->{repository}";
> +	    $blockdev .= ",snapshot=$pbs_conf->{snapshot}";
> +	    $blockdev .= ",archive=$pbs_conf->{archive}";
> +	    $blockdev .= ",keyfile=$pbs_conf->{keyfile}" if $pbs_conf->{keyfile};
> +	    push @$devices, '-blockdev', $blockdev;
> +
> +	    # modify drive command to put the desired target file behind an
> +	    # 'alloc-track' node
> +	    $drive_cmd =~ s/file=([^,]+)/file.file.filename=$1/;
> +	    $drive_cmd =~ s/,format=([^,]+)/,file.driver=$1,format=alloc-track/;

This seems really fragile and hacky, please avoid string replacements on variables
we assemble ourself.

> +	    $drive_cmd .= ",backing=$pbs_name";
> +	    $drive_cmd .= ",auto-remove=on";
> +
> +	    # note: 'cache' and 'aio' directly affect the 'drive' parameter, so
> +	    # we don't need to change them to 'file.', but 'detect-zeroes' works
> +	    # per blockdev and we want it to persist after the alloc-track is
> +	    # removed, so put it on 'file' directly
> +	    $drive_cmd =~ s/,detect-zeroes=([^,]+)/,file.detect-zeroes=$1/;
> +	}
> +
>  	push @$devices, '-drive',$drive_cmd;
>  	push @$devices, '-device', print_drivedevice_full(
>  	    $storecfg, $conf, $vmid, $drive, $bridges, $arch, $machine_type);
> @@ -4915,6 +4942,15 @@ sub vm_start {
>  #   timeout => in seconds
>  #   paused => start VM in paused state (backup)
>  #   resume => resume from hibernation
> +#   pbs-backing => {
> +#      sata0 => {
> +#         repository
> +#         snapshot
> +#         keyfile
> +#         archive
> +#      },
> +#      virtio2 => ...
> +#   }
>  # migrate_opts:
>  #   nbd => volumes for NBD exports (vm_migrate_alloc_nbd_disks)
>  #   migratedfrom => source node
> @@ -4961,8 +4997,8 @@ sub vm_start_nolock {
>  	print "Resuming suspended VM\n";
>      }
>  
> -    my ($cmd, $vollist, $spice_port) =
> -	config_to_command($storecfg, $vmid, $conf, $defaults, $forcemachine, $forcecpu);
> +    my ($cmd, $vollist, $spice_port) = config_to_command($storecfg, $vmid,
> +	$conf, $defaults, $forcemachine, $forcecpu, $params->{'pbs-backing'});
>  
>      my $migration_ip;
>      my $get_migration_ip = sub {
> 






WARNING: multiple messages have this Message-ID
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
	Stefan Reiter <s.reiter@proxmox.com>,
	pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [pve-devel] [PATCH qemu-server 07/11] cfg2cmd: allow PBS snapshots as backing files for drives
Date: Thu, 28 Jan 2021 17:25:33 +0100	[thread overview]
Message-ID: <246fec98-7324-7af5-5cd4-e2ef539b287a@proxmox.com> (raw)
In-Reply-To: <20210111111409.32385-8-s.reiter@proxmox.com>

On 11.01.21 12:14, Stefan Reiter wrote:
> Uses the custom 'alloc-track' filter node to redirect writes to the
> original drives target, while unwritten blocks will be read from the
> specified PBS snapshot.
> 
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>  PVE/QemuServer.pm | 42 +++++++++++++++++++++++++++++++++++++++---
>  1 file changed, 39 insertions(+), 3 deletions(-)
> 
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index d517dae..6de6ff6 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -3022,7 +3022,8 @@ sub query_understood_cpu_flags {
>  }
>  
>  sub config_to_command {
> -    my ($storecfg, $vmid, $conf, $defaults, $forcemachine, $forcecpu) = @_;
> +    my ($storecfg, $vmid, $conf, $defaults, $forcemachine, $forcecpu,
> +        $pbs_backing) = @_;
>  
>      my $cmd = [];
>      my $globalFlags = [];
> @@ -3521,6 +3522,32 @@ sub config_to_command {
>  	my $drive_cmd = print_drive_commandline_full($storecfg, $vmid, $drive);
>  	$drive_cmd .= ',readonly' if PVE::QemuConfig->is_template($conf);
>  
> +	if ($pbs_backing && defined($pbs_backing->{$ds})) {

please avoid extending config_to_command to much, move to own method.

> +	    my $pbs_conf = $pbs_backing->{$ds};
> +	    my $pbs_name = "drive-$ds-pbs";
> +
> +	    # add PBS block device to access snapshot from QEMU
> +	    my $blockdev = "driver=pbs,node-name=$pbs_name,read-only=on";
> +	    $blockdev .= ",repository=$pbs_conf->{repository}";
> +	    $blockdev .= ",snapshot=$pbs_conf->{snapshot}";
> +	    $blockdev .= ",archive=$pbs_conf->{archive}";
> +	    $blockdev .= ",keyfile=$pbs_conf->{keyfile}" if $pbs_conf->{keyfile};
> +	    push @$devices, '-blockdev', $blockdev;
> +
> +	    # modify drive command to put the desired target file behind an
> +	    # 'alloc-track' node
> +	    $drive_cmd =~ s/file=([^,]+)/file.file.filename=$1/;
> +	    $drive_cmd =~ s/,format=([^,]+)/,file.driver=$1,format=alloc-track/;

This seems really fragile and hacky, please avoid string replacements on variables
we assemble ourself.

> +	    $drive_cmd .= ",backing=$pbs_name";
> +	    $drive_cmd .= ",auto-remove=on";
> +
> +	    # note: 'cache' and 'aio' directly affect the 'drive' parameter, so
> +	    # we don't need to change them to 'file.', but 'detect-zeroes' works
> +	    # per blockdev and we want it to persist after the alloc-track is
> +	    # removed, so put it on 'file' directly
> +	    $drive_cmd =~ s/,detect-zeroes=([^,]+)/,file.detect-zeroes=$1/;
> +	}
> +
>  	push @$devices, '-drive',$drive_cmd;
>  	push @$devices, '-device', print_drivedevice_full(
>  	    $storecfg, $conf, $vmid, $drive, $bridges, $arch, $machine_type);
> @@ -4915,6 +4942,15 @@ sub vm_start {
>  #   timeout => in seconds
>  #   paused => start VM in paused state (backup)
>  #   resume => resume from hibernation
> +#   pbs-backing => {
> +#      sata0 => {
> +#         repository
> +#         snapshot
> +#         keyfile
> +#         archive
> +#      },
> +#      virtio2 => ...
> +#   }
>  # migrate_opts:
>  #   nbd => volumes for NBD exports (vm_migrate_alloc_nbd_disks)
>  #   migratedfrom => source node
> @@ -4961,8 +4997,8 @@ sub vm_start_nolock {
>  	print "Resuming suspended VM\n";
>      }
>  
> -    my ($cmd, $vollist, $spice_port) =
> -	config_to_command($storecfg, $vmid, $conf, $defaults, $forcemachine, $forcecpu);
> +    my ($cmd, $vollist, $spice_port) = config_to_command($storecfg, $vmid,
> +	$conf, $defaults, $forcemachine, $forcecpu, $params->{'pbs-backing'});
>  
>      my $migration_ip;
>      my $get_migration_ip = sub {
> 






  reply	other threads:[~2021-01-28 16:25 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-11 11:13 [pve-devel] [PATCH 00/11] live-restore for PBS snapshots Stefan Reiter
2021-01-11 11:13 ` [pbs-devel] " Stefan Reiter
2021-01-11 11:13 ` [pve-devel] [PATCH qemu 01/11] PVE: explicitly add libuuid as linking dependency Stefan Reiter
2021-01-11 11:13   ` [pbs-devel] " Stefan Reiter
2021-01-12 12:04   ` [pve-devel] " Thomas Lamprecht
2021-01-12 12:04     ` Thomas Lamprecht
2021-01-18 10:27     ` [pve-devel] [PATCH pve-qemu] explicitly specify " Stefan Reiter
2021-01-27  8:29       ` Stefan Reiter
2021-01-11 11:14 ` [pve-devel] [PATCH qemu 02/11] PVE: block/pbs: fast-path reads without allocation if possible Stefan Reiter
2021-01-11 11:14   ` [pbs-devel] " Stefan Reiter
2021-01-12  9:29   ` [pve-devel] " Wolfgang Bumiller
2021-01-12  9:29     ` [pbs-devel] " Wolfgang Bumiller
2021-01-11 11:14 ` [pve-devel] [PATCH qemu 03/11] block: add alloc-track driver Stefan Reiter
2021-01-11 11:14   ` [pbs-devel] " Stefan Reiter
2021-01-12 10:54   ` [pve-devel] " Wolfgang Bumiller
2021-01-12 10:54     ` [pbs-devel] " Wolfgang Bumiller
2021-01-12 11:29     ` Stefan Reiter
2021-01-12 11:29       ` [pbs-devel] " Stefan Reiter
2021-01-12 13:42       ` Wolfgang Bumiller
2021-01-12 13:42         ` [pbs-devel] " Wolfgang Bumiller
2021-01-11 11:14 ` [pve-devel] [PATCH proxmox-backup 04/11] RemoteChunkReader: add LRU cached variant Stefan Reiter
2021-01-11 11:14   ` [pbs-devel] " Stefan Reiter
2021-01-11 11:14 ` [pve-devel] [PATCH proxmox-backup-qemu 05/11] access: use bigger cache and LRU chunk reader Stefan Reiter
2021-01-11 11:14   ` [pbs-devel] " Stefan Reiter
2021-01-11 11:14 ` [pve-devel] [PATCH qemu-server 06/11] make qemu_drive_mirror_monitor more generic Stefan Reiter
2021-01-11 11:14   ` [pbs-devel] " Stefan Reiter
2021-01-12 13:19   ` [pve-devel] " Wolfgang Bumiller
2021-01-12 13:19     ` [pbs-devel] " Wolfgang Bumiller
2021-01-11 11:14 ` [pve-devel] [PATCH qemu-server 07/11] cfg2cmd: allow PBS snapshots as backing files for drives Stefan Reiter
2021-01-11 11:14   ` [pbs-devel] " Stefan Reiter
2021-01-28 16:25   ` Thomas Lamprecht [this message]
2021-01-28 16:25     ` [pbs-devel] [pve-devel] " Thomas Lamprecht
2021-01-11 11:14 ` [pve-devel] [PATCH qemu-server 08/11] enable live-restore for PBS Stefan Reiter
2021-01-11 11:14   ` [pbs-devel] " Stefan Reiter
2021-01-11 11:14 ` [pve-devel] [PATCH qemu-server 09/11] extract register_qmeventd_handle to QemuServer.pm Stefan Reiter
2021-01-11 11:14   ` [pbs-devel] " Stefan Reiter
2021-01-11 11:14 ` [pve-devel] [PATCH qemu-server 10/11] live-restore: register qmeventd handle Stefan Reiter
2021-01-11 11:14   ` [pbs-devel] " Stefan Reiter
2021-01-11 11:14 ` [pve-devel] [PATCH manager 11/11] ui: restore: add live-restore checkbox Stefan Reiter
2021-01-11 11:14   ` [pbs-devel] " Stefan Reiter
2021-01-11 15:50 ` [pve-devel] [PATCH 00/11] live-restore for PBS snapshots aderumier
2021-01-11 15:50   ` [pbs-devel] " aderumier
2021-01-11 16:42   ` Stefan Reiter
2021-01-12  9:10     ` aderumier
2021-01-12 10:31   ` [pve-devel] [pbs-devel] " Thomas Lamprecht
2021-01-12 10:31     ` [pbs-devel] [pve-devel] " Thomas Lamprecht
2021-01-12 11:23     ` [pve-devel] [pbs-devel] " Thomas Lamprecht
2021-01-12 11:23       ` [pbs-devel] [pve-devel] " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=246fec98-7324-7af5-5cd4-e2ef539b287a@proxmox.com \
    --to=t.lamprecht@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    --cc=s.reiter@proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal