close #6669: plugin api: introduce on_update_hook_full() method

The original on_update_hook() method is limited, because only the
updated properties and values are passed in. Introduce a new
on_update_hook_full() method which also receives the current storage
configuration and the list of which properties are to be deleted. This
allows detecting and reacting to all changes and knowing how values
changed.

Deletion of properties is deferred to after the on_update_hook(_full)
call. This makes it possible to pass the unmodified current storage
configuration to the method.

The default implementation of on_update_hook_full() just falls back to
the original on_update_hook().

Bump APIVER and APIAGE.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner
2025-10-08 17:11:31 +02:00
committed by Thomas Lamprecht
parent 24367c07d3
commit 0b1331ccda
3 changed files with 59 additions and 3 deletions

View File

@ -48,6 +48,17 @@ Future changes should be documented in here.
Plugins that do not require hints can safely ignore the additional parameter. Plugins that do not require hints can safely ignore the additional parameter.
* Introduce `on_update_hook_full()` plugin method
The original `on_update_hook()` plugin method was limited, because only the updated properties and
values would be passed in. The new `on_update_hook_full()` plugin method also receives the current
storage configuration and the list of which properties are to be deleted. This allows detecting
and reacting to all changes and knowing how values changed. See also bug #6669 [0] for the initial
motiviation. If a plugin implements `on_update_hook_full()`, that method will be called rather
than the `on_update_hook()` method.
[0]: https://bugzilla.proxmox.com/show_bug.cgi?id=6669
## Version 12: ## Version 12:
* Introduce `qemu_blockdev_options()` plugin method * Introduce `qemu_blockdev_options()` plugin method

View File

@ -360,6 +360,9 @@ __PACKAGE__->register_method({
my $plugin = PVE::Storage::Plugin->lookup($type); my $plugin = PVE::Storage::Plugin->lookup($type);
my $opts = $plugin->check_config($storeid, $param, 0, 1); my $opts = $plugin->check_config($storeid, $param, 0, 1);
# Do checks for deletion up-front, but defer actual deletion until after the
# on_update_hook(_full) call. This makes it possible to pass the unmodified current
# storage configuration to the method.
if ($delete) { if ($delete) {
my $options = $plugin->private()->{options}->{$type}; my $options = $plugin->private()->{options}->{$type};
foreach my $k (@$delete) { foreach my $k (@$delete) {
@ -368,13 +371,22 @@ __PACKAGE__->register_method({
die "unable to delete fixed option '$k'\n" if $d->{fixed}; die "unable to delete fixed option '$k'\n" if $d->{fixed};
die "cannot set and delete property '$k' at the same time!\n" die "cannot set and delete property '$k' at the same time!\n"
if defined($opts->{$k}); if defined($opts->{$k});
}
}
if ($plugin->can('api') && $plugin->api() < 13) {
$returned_config = $plugin->on_update_hook($storeid, $opts, %$sensitive);
} else {
$returned_config =
$plugin->on_update_hook_full($storeid, $scfg, $opts, $delete, $sensitive);
}
if ($delete) {
for my $k ($delete->@*) {
delete $scfg->{$k}; delete $scfg->{$k};
} }
} }
$returned_config = $plugin->on_update_hook($storeid, $opts, %$sensitive);
for my $k (keys %$opts) { for my $k (keys %$opts) {
$scfg->{$k} = $opts->{$k}; $scfg->{$k} = $opts->{$k};
} }

View File

@ -711,6 +711,39 @@ sub on_update_hook {
return undef; return undef;
} }
=head3 on_update_hook_full
$returned_config = $plugin->on_update_hook_full($storeid, $scfg, $update, $delete, $sensitive);
Most plugins use an empty C<return>, so that C<$returned_config> will be C<undef>. While a plugin
can return auto-generated properties via C<$returned_config>, this is currently only used for the
C<'encryption-key'> for the PBS plugin.
Arguments:
=over
=item C<$storeid>: The storage ID.
=item C<$scfg>: The current storage configuration.
=item C<$update>: Hash reference with properties to be updated and their new values.
=item C<$delete>: Array reference with properties to be deleted.
=item C<$sensitive>: Hash reference with sensitive properties and their new values. Sensitive
properties are declared via the plugin data method C<plugindata()>.
=back
=cut
sub on_update_hook_full {
my ($class, $storeid, $scfg, $update, $delete, $sensitive) = @_;
return $class->on_update_hook($storeid, $update, $sensitive->%*);
}
# called during deletion of storage (before the new storage config got written) # called during deletion of storage (before the new storage config got written)
# and if the activate check on addition fails, to cleanup all storage traces # and if the activate check on addition fails, to cleanup all storage traces
# which on_add_hook may have created. # which on_add_hook may have created.