wip -- tests fail -- Improve worker load limit

Related progress issue: https://progress.opensuse.org/issues/168244
os-autoinst · Oct 15, 2024 · 7d9d9ea · 7d9d9ea
1 parent 689af42
commit 7d9d9ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/OpenQA/Worker.pm b/lib/OpenQA/Worker.pm
@@ -765,7 +765,8 @@ sub _check_system_utilization ($self) {
     my @load = _load_avg;
     return undef unless @load;
     return "The average load (@load) is exceeding the configured threshold of $threshold."
-      if $load[2] > $threshold;
+      #unless max @load < $threshold || ($load[0] < $threshold && $load[0] < $load[1] && $load[1] < $load[2]);
+      if max @load > $threshold && $load[0] > $load[1] && $load[1] > $load[2];
     return undef;
 }
 

diff --git a/t/24-worker-overall.t b/t/24-worker-overall.t
@@ -29,7 +29,7 @@ $ENV{OPENQA_CONFIG} = "$FindBin::Bin/data/24-worker-overall";
 #       file specified via OPENQA_LOGFILE instead of stdout/stderr.
 $ENV{OPENQA_LOGFILE} = undef;
 
-my $load_avg_file = simulate_load('0.93 0.95 10.25 2/2207 1212', 'worker-overall-load-avg');
+my $load_avg_file = simulate_load('10.93 10.91 10.25 2/2207 1212', 'worker-overall-load-avg');
 
 # define fake isotovideo
 {