all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Daniel Kral" <d.kral@proxmox.com>
To: "Fiona Ebner" <f.ebner@proxmox.com>, <pve-devel@lists.proxmox.com>
Subject: Re: [PATCH ha-manager v4 11/27] resources: add migrate_json_properties() method
Date: Fri, 16 Oct 2026 11:51:22 +0200	[thread overview]
Message-ID: <DM664LG003WH.2HC3ZWX7NH46M@proxmox.com> (raw)
In-Reply-To: <20261015125112.174954-12-f.ebner@proxmox.com>

On Thu Oct 15, 2026 at 2:50 PM CEST, Fiona Ebner wrote:
> Will be used by the API schema for resource-type specific migration
> options. When migrating dependent resources, the migration options
> will be filtered according to the resource type, so the property
> schema is also needed there.
>
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
>
> Dependency bump for pve-container and qemu-server needed!
>
> Changes in v4:
> * Split out from other patch and turn into proper method, because
>   this is needed for filtering properties when migrating a dependent
>   resource.
>
>  src/PVE/HA/Resources.pm       | 20 ++++++++++++++++++++
>  src/PVE/HA/Resources/PVECT.pm | 11 +++++++++++
>  src/PVE/HA/Resources/PVEVM.pm | 11 +++++++++++
>  src/PVE/HA/Sim/Resources.pm   |  6 ++++++
>  4 files changed, 48 insertions(+)
>
> diff --git a/src/PVE/HA/Resources.pm b/src/PVE/HA/Resources.pm
> index 656cb19..57fde00 100644
> --- a/src/PVE/HA/Resources.pm
> +++ b/src/PVE/HA/Resources.pm
> @@ -103,6 +103,20 @@ EODESC
>      },
>  };
>  
> +our $common_migrate_json_properties = {
> +    sid => get_standard_option(
> +        'pve-ha-resource-or-vm-id',
> +        { completion => \&PVE::HA::Tools::complete_sid },
> +    ),
> +    node => get_standard_option(
> +        'pve-node',
> +        {
> +            completion => \&PVE::Cluster::complete_migration_target,

missing 'use PVE::Cluster' statement

> +            description => "Target node.",
> +        },
> +    ),
> +};
> +
>  sub verify_name {
>      my ($class, $name) = @_;
>  
> @@ -159,6 +173,12 @@ sub migrate {
>      die "implement in subclass";
>  }
>  
> +sub migrate_json_properties {
> +    my ($class) = @_;
> +
> +    die "implement in subclass";
> +}
> +
>  sub config_file {
>      my ($class, $id, $nodename) = @_;
>  
> diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm
> index a8fe42e..67bab7a 100644
> --- a/src/PVE/HA/Resources/PVECT.pm
> +++ b/src/PVE/HA/Resources/PVECT.pm
> @@ -174,4 +174,15 @@ sub get_static_stats_from_config {
>      };
>  }
>  
> +# FIXME: the extra properties are missing from the docs, since the PVE::API2::LXC module can't be
> +# included in the generating docs environment, because of cyclic dependencies..
> +sub migrate_json_properties {
> +    my ($class) = @_;
> +    my $combined = { $PVE::HA::Resources::common_migrate_json_properties->%* };
> +    my $extra_migrate_props = eval { PVE::API2::LXC::ha_migrate_json_properties() } // {};
> +    die $@ if $@ && !$ENV{PVE_GENERATING_DOCS};
> +    $combined->{$_} = $extra_migrate_props->{$_} for keys $extra_migrate_props->%*;
> +    return $combined;
> +}

Not a serious blocker at all, but since we use migrate_json_properties()
in Manager as well now and the return value won't change within one
runtime, this could be a static variable initialized at startup whose
reference is returned here, so we don't need to create a new hash for
every dependent HA resource type in queue_resource_motion() in the next
patch.

> +
>  1;
> diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm
> index 3b61113..76b927c 100644
> --- a/src/PVE/HA/Resources/PVEVM.pm
> +++ b/src/PVE/HA/Resources/PVEVM.pm
> @@ -194,4 +194,15 @@ sub get_static_stats_from_config {
>      };
>  }
>  
> +# FIXME: the extra properties are missing from the docs, since the PVE::API2::QEMU module can't be
> +# included in the generating docs environment, because of cyclic dependencies..
> +sub migrate_json_properties {
> +    my ($class) = @_;
> +    my $combined = { $PVE::HA::Resources::common_migrate_json_properties->%* };
> +    my $extra_migrate_props = eval { PVE::API2::Qemu::ha_migrate_json_properties() } // {};
> +    die $@ if $@ && !$ENV{PVE_GENERATING_DOCS};
> +    $combined->{$_} = $extra_migrate_props->{$_} for keys $extra_migrate_props->%*;
> +    return $combined;
> +}

Same here

> +
>  1;
> diff --git a/src/PVE/HA/Sim/Resources.pm b/src/PVE/HA/Sim/Resources.pm
> index a464c62..730bfaa 100644
> --- a/src/PVE/HA/Sim/Resources.pm
> +++ b/src/PVE/HA/Sim/Resources.pm
> @@ -122,6 +122,12 @@ sub migrate {
>      return defined($ss->{$sid}) ? 0 : 1;
>  }
>  
> +sub migrate_json_properties {
> +    my ($class) = @_;
> +
> +    return $PVE::HA::Resources::common_migrate_json_properties;
> +}
> +
>  sub remove_locks {
>      my ($self, $haenv, $id, $locks, $service_node) = @_;
>  






  reply	other threads:[~2026-10-16  9:51 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-15 12:50 [PATCH-SERIES many v4 00/27] migration: strict config check for intra-cluster migration Fiona Ebner
2026-10-15 12:50 ` [PATCH common v4 01/27] tools: move version_cmp() helper from qemu-server Fiona Ebner
2026-10-15 12:50 ` [PATCH common v4 02/27] rest handler: handle: respect schema's 'type-property' when resolving type Fiona Ebner
2026-10-15 12:50 ` [PATCH cluster v4 03/27] cluster: move pvecfg node version helpers from qemu-server Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 04/27] update crm commands: align logging with next state started/stopped Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 05/27] manager: factor out helper to check if requested resource motion is valid Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 06/27] next state stopped: align logging for motion command with next_state_started() Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 07/27] next state {stopped,started}: factor out helper to handle motion command Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 08/27] lrm: resource migration: support extra migration options Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 09/27] change service state: support hash as a parameter value Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 10/27] next state: handle motion command: support migration options Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 11/27] resources: add migrate_json_properties() method Fiona Ebner
2026-10-16  9:51   ` Daniel Kral [this message]
2026-10-15 12:50 ` [PATCH ha-manager v4 12/27] queue resource motion: support migration options Fiona Ebner
2026-10-15 12:50 ` [PATCH ha-manager v4 13/27] crm command: support JSON-style migrate command Fiona Ebner
2026-10-16  9:53   ` Daniel Kral
2026-10-15 12:50 ` [PATCH ha-manager v4 14/27] api: resources: migration: support additional migration options Fiona Ebner
2026-10-16  9:54   ` Daniel Kral
2026-10-15 12:50 ` [PATCH ha-manager v4 15/27] test: add test for " Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 16/27] helpers: move version_cmp() helper to pve-common Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 17/27] helpers: move pvecfg node version helpers to pve-cluster Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 18/27] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 19/27] fix #7053: api: migrate: pass 'with-conntrack-state' flag to HA migration Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 20/27] qm: mtunnel: reply when a command is unknown Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 21/27] qm: mtunnel: add 'conf' command to do strict configuration parsing Fiona Ebner
2026-10-15 12:50 ` [PATCH qemu-server v4 22/27] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-10-15 12:50 ` [PATCH container v4 23/27] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-10-15 12:50 ` [PATCH container v4 24/27] pct: introduce mtunnel command Fiona Ebner
2026-10-15 12:50 ` [PATCH container v4 25/27] d/control: bump versioned build dependency for libpve-common-perl to 9.0.12 Fiona Ebner
2026-10-15 12:51 ` [PATCH container v4 26/27] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-10-15 12:51 ` [PATCH manager v4 27/27] ui: migrate: add checkbox to allow skipping newly enforced config check Fiona Ebner

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=DM664LG003WH.2HC3ZWX7NH46M@proxmox.com \
    --to=d.kral@proxmox.com \
    --cc=f.ebner@proxmox.com \
    --cc=pve-devel@lists.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