Am 30/01/2024 um 18:10 schrieb Friedrich Weber:
> The new `overrule-shutdown` parameter is boolean and defaults to 0. If
> it is 1, all active `vzshutdown` tasks by the current user for the same
> CT are aborted before attempting to stop the CT.
>
> Passing `overrule-shutdown=1` is forbidden for HA resources.
>
> Signed-off-by: Friedrich Weber <f.we...@proxmox.com>
> ---
>
> Notes:
> changes v1 -> v2:
> * move overrule code into worker, as suggested by Wolfgang
> * print to worker stdout instead of syslog
>
> src/PVE/API2/LXC/Status.pm | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/src/PVE/API2/LXC/Status.pm b/src/PVE/API2/LXC/Status.pm
> index 7741374..33f449c 100644
> --- a/src/PVE/API2/LXC/Status.pm
> +++ b/src/PVE/API2/LXC/Status.pm
> @@ -220,6 +220,12 @@ __PACKAGE__->register_method({
> node => get_standard_option('pve-node'),
> vmid => get_standard_option('pve-vmid', { completion =>
> \&PVE::LXC::complete_ctid_running }),
> skiplock => get_standard_option('skiplock'),
> + 'overrule-shutdown' => {
> + description => "Abort any active 'vzshutdown' task by the
> current user for this CT before stopping",
> + optional => 1,
> + type => 'boolean',
> + default => 0,
> + }
> },
> },
> returns => {
> @@ -237,10 +243,15 @@ __PACKAGE__->register_method({
> raise_param_exc({ skiplock => "Only root may use this option." })
> if $skiplock && $authuser ne 'root@pam';
>
> + my $overrule_shutdown = extract_param($param, 'overrule-shutdown');
> +
> die "CT $vmid not running\n" if !PVE::LXC::check_running($vmid);
>
> if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne
> 'ha') {
>
> + raise_param_exc({ 'overrule-shutdown' => "Not applicable for HA
> resources." })
> + if $overrule_shutdown;
This probably could be implemented through a CRM command and would be nice
to have in the long-run. The more HA and non-HA resources can be managed
the same the better, as otherwise it's causing friction to use HA.
The same holds for the qemu-server patch.
But, I'm fine with doing this separately later on, as this on its own is
already an improvement for quite a few users.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
