throttling: refactor the configuration logic

  Load the resulting hash after validated the throtting configuration,in Setup.pm
  Calculate the resulting priority and update debug_message,in Jobs.pm

  Ref. note-10 in poo#192952

Author: m-dati

lib/OpenQA/Schema/ResultSet/Jobs.pm

@@ -101,14 +101,6 @@ sub latest_jobs ($self, $until = undef) {
     return @latest;
 }
 
-sub load_throttling_config ($config_string) {
-    # convert in hash the prio_throttling_parameters string configured in openqa.ini
-    return unless ($config_string && $config_string =~ /:/);
-    $config_string =~ s/\s+//g;
-    my %hash = map { my ($k, $v) = split /:/, $_, 2 } split /,/, $config_string;
-    return \%hash;
-}
-
 sub create_from_settings ($self, $settings, $scheduled_product_id = undef) {
     my %settings = %$settings;
     my %new_job_args;
@@ -166,17 +158,21 @@ sub create_from_settings ($self, $settings, $scheduled_product_id = undef) {
             $new_job_args{priority} += $malus;
         }
     }
-    my $throttling = OpenQA::App->singleton->config->{misc_limits}->{prio_throttling_parameters};
-    $throttling = load_throttling_config($throttling);
     # apply resources throttling control
-    if ($throttling) {
+    if (my $throttling = OpenQA::App->singleton->config->{misc_limits}->{prio_throttling_parameters}) {
+        my $debug_msg_2;
         for my $resource (keys %$throttling) {
             next if !defined $settings{$resource};
-            my $malus = int($settings{$resource} * $throttling->{$resource});
-            $debug_msg = sprintf 'Adding priority malus to newly created job due to %s (old: %d, malus: %s)',
-              $resource, $new_job_args{priority}, $malus;
-            $new_job_args{priority} += $malus;
+            my $scale = $throttling->{$resource}->{scale};
+            my $reference = $throttling->{$resource}->{reference};
+            my $prio = int(($settings{$resource} - $reference) * $scale);
+            $debug_msg_2 .= sprintf " %s %s %s;",
+              $resource, ", scale:$scale", ($reference ? ", reference:$reference" : '');
+            $new_job_args{priority} += $prio;
         }
+        $debug_msg .= sprintf("\nAdjusting job priority by %s based on resource requirement(s):\n %s",
+            $new_job_args{priority}, $debug_msg_2)
+          if $debug_msg_2;
     }
 
     my $job = $self->create(\%new_job_args);

lib/OpenQA/Setup.pm

@@ -61,13 +61,24 @@ sub _load_config ($app, $defaults, $mode_specific_defaults) {
     return $config;
 }
 
-sub validate_prio_throttling_format ($config) {
+sub _load_prio_throttling ($config) {
     my $throttling = $config->{misc_limits}->{prio_throttling_parameters};
-    if ($throttling && length $throttling) {
-        $config->{misc_limits}->{prio_throttling_parameters} =~ s/\s+//g;
-        die("Wrong formatting for 'prio_throttling_parameters' in openqa.ini")
-          unless ($throttling =~ /^[A-Z_]+:\d+(?:,[A-Z_]+:\d+)*$/i);
+    my %hash;
+    if ($throttling) {
+        my $n = qr/[+-]?(?:\d+\.?\d*|\.\d+)/;    # number
+        my $u = qr/([A-Z_]+):($n)(?::($n))?/i;    # Key:N:M = $1:$2:$3
+
+        # remove spaces and validate comma-separated keys sequence
+        $throttling =~ s/\s+//g;
+        $app->log->warn("Wrong format in openqa.ini 'prio_throttling_parameters': $throttling")
+          unless ($throttling =~ qr/^$u(?:,$u)*$/i);
+
+        # Implicit iteration along the sequence
+        while ($throttling =~ /,?$u/g) {
+            $hash{$1} = {scale => $2, reference => $3 // 0};
+        }
     }
+    $config->{misc_limits}->{prio_throttling_parameters} = \%hash;
 }
 
 sub read_config ($app) {
@@ -304,7 +315,7 @@ sub read_config ($app) {
         $config->{influxdb}->{ignored_failed_minion_jobs} = [split(/\s+/, $minion_fail_job_blocklist)];
     }
 
-    validate_prio_throttling_format($config);
+    _load_prio_throttling($config);
 
     my $results = delete $global_config->{parallel_children_collapsable_results};
     $global_config->{parallel_children_collapsable_results_sel}