[pve-devel] [PATCH ha-manager v2 15/18] manager: move group migration cooldown variable into helper

[Daniel Kral <d.kral@proxmox.com>]

The variable is only used in the try_persistent_group_migration(...)
helper. While at it, add a comment and change the name to make its
meaning clearer.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
Reviewed-by: Michael Köppl <m.koeppl@proxmox.com>
Tested-by: Michael Köppl <m.koeppl@proxmox.com>
---
changes since v1:
  - s/group_migration_cooldown_round/group_migration_cooldown_rounds/

 src/PVE/HA/Manager.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index a874708d..2e67c646 100644
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -41,8 +41,6 @@ use PVE::HA::Usage::Static;
 # patches for changing above, as that set is mostly sensible and should be easy to remember once
 # spending a bit time in the HA code base.
 
-my $group_migration_cooldown = 6;
-
 sub new {
     my ($this, $haenv) = @_;
 
@@ -641,13 +639,16 @@ my $migrate_group_persistently = sub {
 sub try_persistent_group_migration {
     my ($self) = @_;
 
+    # rounds to wait until next ha group migration try
+    my $group_migration_cooldown_rounds = 6;
+
     my ($haenv, $ns, $ss) = ($self->{haenv}, $self->{ns}, $self->{ss});
 
     return if $have_groups_been_migrated->($haenv);
 
     $self->{group_migration_round}--;
     return if $self->{group_migration_round} > 0;
-    $self->{group_migration_round} = $group_migration_cooldown;
+    $self->{group_migration_round} = $group_migration_cooldown_rounds;
 
     $haenv->log('notice', "start ha group migration...");
 
@@ -657,8 +658,8 @@ sub try_persistent_group_migration {
         $haenv->log('err', "ha groups migration failed");
         $haenv->log(
             'notice',
-            "retry ha groups migration in $group_migration_cooldown rounds (~ "
-                . $group_migration_cooldown * 10
+            "retry ha groups migration in $group_migration_cooldown_rounds rounds (~ "
+                . $group_migration_cooldown_rounds * 10
                 . " seconds)",
         );
     }
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel