Am 25.03.25 um 16:12 schrieb Daniel Kral:
> Add an option to the VirtFail's name to allow the start and migrate fail
> counts to only apply on a certain node number with a specific naming
> scheme.
>
> This allows a slightly more elaborate test type, e.g. where a service
> can start on one node (or any other in that case), but fails to start on
> a specific node, which it is expected to start on after a migration.
>
> Signed-off-by: Daniel Kral <d.k...@proxmox.com>
With some nits:
Reviewed-by: Fiona Ebner <f.eb...@proxmox.com>
> ---
> src/PVE/HA/Sim/Resources/VirtFail.pm | 37 +++++++++++++++++++---------
> 1 file changed, 26 insertions(+), 11 deletions(-)
>
> diff --git a/src/PVE/HA/Sim/Resources/VirtFail.pm
> b/src/PVE/HA/Sim/Resources/VirtFail.pm
> index ce88391..fddecd6 100644
> --- a/src/PVE/HA/Sim/Resources/VirtFail.pm
> +++ b/src/PVE/HA/Sim/Resources/VirtFail.pm
> @@ -10,25 +10,36 @@ use base qw(PVE::HA::Sim::Resources);
> # To make it more interesting we can encode some behavior in the VMID
> # with the following format, where fa: is the type and a, b, c, ...
> # are digits in base 10, i.e. the full service ID would be:
> -# fa:abcde
> +# fa:abcdef
> # And the digits after the fa: type prefix would mean:
> # - a: no meaning but can be used for differentiating similar resources
> # - b: how many tries are needed to start correctly (0 is normal behavior)
> (should be set)
> # - c: how many tries are needed to migrate correctly (0 is normal
> behavior) (should be set)
> # - d: should shutdown be successful (0 = yes, anything else no) (optional)
> # - e: return value of $plugin->exists() defaults to 1 if not set
> (optional)
> +# - f: limits the constraints of b and c to the nodeX (0 = apply to all
> nodes) (optional)
Requires us to have exactly this kind of node name for such tests, but
can be fine IMHO.
>
> my $decode_id = sub {
> my $id = shift;
>
> - my ($start, $migrate, $stop, $exists) = $id =~ /^\d(\d)(\d)(\d)?(\d)?/g;
> + my ($start, $migrate, $stop, $exists, $limit_to_node) = $id =~
> /^\d(\d)(\d)(\d)?(\d)?(\d)?/g;
>
> $start = 0 if !defined($start);
> $migrate = 0 if !defined($migrate);
> $stop = 0 if !defined($stop);
> $exists = 1 if !defined($exists);
> + $limit_to_node = 0 if !defined($limit_to_node);
>
> - return ($start, $migrate, $stop, $exists)
> + return ($start, $migrate, $stop, $exists, $limit_to_node);
> +};
> +
> +my $should_retry_action = sub {
"action" feels a bit too general to me. It does not apply to all
actions. Also it determines whether the action itself should fail.
Retrying is then just the consequence.
> + my ($haenv, $limit_to_node) = @_;
> +
> + my ($node) = $haenv->nodename() =~ /^node(\d)/g;
No need for a regex, you could just check $limit_to_node == 0 early and
then compare with the exactly known value.
> + $node = 0 if !defined($node);
> +
> + return $limit_to_node == 0 || $limit_to_node == $node;
> };
>
> my $tries = {
> @@ -53,12 +64,14 @@ sub exists {
> sub start {
> my ($class, $haenv, $id) = @_;
>
> - my ($start_failure_count) = &$decode_id($id);
> + my ($start_failure_count, $limit_to_node) = (&$decode_id($id))[0,4];
Style nit: pre-existing, but you can go for $decode_id->()
>
> - $tries->{start}->{$id} = 0 if !$tries->{start}->{$id};
> - $tries->{start}->{$id}++;
> + if ($should_retry_action->($haenv, $limit_to_node)) {
> + $tries->{start}->{$id} = 0 if !$tries->{start}->{$id};
> + $tries->{start}->{$id}++;
>
> - return if $start_failure_count >= $tries->{start}->{$id};
> + return if $start_failure_count >= $tries->{start}->{$id};
> + }
>
> $tries->{start}->{$id} = 0; # reset counts
>
> @@ -79,12 +92,14 @@ sub shutdown {
> sub migrate {
> my ($class, $haenv, $id, $target, $online) = @_;
>
> - my (undef, $migrate_failure_count) = &$decode_id($id);
> + my ($migrate_failure_count, $limit_to_node) = (&$decode_id($id))[1,4];
Same as above
>
> - $tries->{migrate}->{$id} = 0 if !$tries->{migrate}->{$id};
> - $tries->{migrate}->{$id}++;
> + if ($should_retry_action->($haenv, $limit_to_node)) {
> + $tries->{migrate}->{$id} = 0 if !$tries->{migrate}->{$id};
> + $tries->{migrate}->{$id}++;
>
> - return if $migrate_failure_count >= $tries->{migrate}->{$id};
> + return if $migrate_failure_count >= $tries->{migrate}->{$id};
> + }
>
> $tries->{migrate}->{$id} = 0; # reset counts
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
