Merge pull request #13958 from mlschroe/master

[backend] add setchanged_unless_othersinprogress method
openSUSE · Mar 7, 2023 · 06343b8 · 06343b8
2 parents a1885f9 + 032885b
commit 06343b8
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 2 deletions.
diff --git a/src/backend/BSSched/Checker.pm b/src/backend/BSSched/Checker.pm
@@ -1444,6 +1444,13 @@ sub setchanged {
   BSSched::Lookat::setchanged($gctx,  $changeprp, $changetype, $changelevel);
 }
 
+sub setchanged_unless_othersinprogress {
+  my ($ctx, $handle) = @_;
+  my $gctx = $ctx->{'gctx'};
+  die("no gctx in ctx\n") unless $gctx;
+  $ctx->setchanged($handle) unless $gctx->{'rctx'}->xrpc_othersinprogress($handle);
+}
+
 sub checkprojectaccess {
   my ($ctx, $projid) = @_;
   return BSSched::Access::checkprpaccess($ctx->{'gctx'}, $projid, $ctx->{'project'});

diff --git a/src/backend/BSSched/RPC.pm b/src/backend/BSSched/RPC.pm
@@ -118,6 +118,7 @@ sub xrpc {
     } else {
       push @{$rctx->{'iswaiting_serverload_low'}->{$server}}, $handle;
     }
+    $handle->{'_ctx'} = $ctx;
     $handle->{'_iswaiting'} = $resource;
     $handle->{'_server'} = $server;
     $iswaiting->{$resource} = $handle;
@@ -177,6 +178,14 @@ sub xrpc_dowakeup {
   my %did;
   # do not trigger a wakeup if some other resources are still in progress
   for my $rh (values(%{$rctx->{'iswaiting'}})) {
+    next if $rh == $handle;
+    if ($rh->{'_ctx'}) {
+      my $rctx = $rh->{'_ctx'};
+      my $rchangeprp = $rh->{'_changeprp'} || $rctx->{'changeprp'};
+      my $rchangetype = $rh->{'_changetype'} || $rctx->{'changetype'} || 'high';
+      my $rchangelevel = $rh->{'_changelevel'} || $rctx->{'changelevel'} || 1;
+      $did{"$rchangeprp/$rchangetype/$rchangelevel"} = 1 if $rchangeprp;
+    }
     $did{$_} = 1 for keys %{$rh->{'_wakeup_have'} || {}};
   }
   for my $whandle (BSUtil::unify(@{$wakeup || []})) {
@@ -190,6 +199,33 @@ sub xrpc_dowakeup {
   }
 }
 
+=head2 xrpc_othersinprogress - return true if this ctx needs to wait for other resources
+
+ TODO: add description
+
+=cut
+
+sub xrpc_othersinprogress {
+  my ($rctx, $handle) = @_;
+  my $ctx = $handle->{'_ctx'};
+  return 0 unless $ctx;
+  my $changeprp = $handle->{'_changeprp'} || $ctx->{'changeprp'};
+  my $changetype = $handle->{'_changetype'} || $ctx->{'changetype'} || 'high';
+  my $changelevel = $handle->{'_changelevel'} || $ctx->{'changelevel'} || 1;
+  my $did = "$changeprp/$changetype/$changelevel";
+  for my $rh (values(%{$rctx->{'iswaiting'}})) {
+    if ($rh->{'_ctx'}) {
+      my $rctx = $rh->{'_ctx'};
+      my $rchangeprp = $rh->{'_changeprp'} || $rctx->{'changeprp'};
+      my $rchangetype = $rh->{'_changetype'} || $rctx->{'changetype'} || 'high';
+      my $rchangelevel = $rh->{'_changelevel'} || $rctx->{'changelevel'} || 1;
+      return 1 if $rchangeprp && $did eq "$rchangeprp/$rchangetype/$rchangelevel";
+    }
+    return 1 if ($rh->{'_wakeup_have'} || {})->{$did};
+  }
+  return 0;
+}
+
 =head2 xrpc_handles - return all active handles
 
  TODO: add description

diff --git a/src/backend/BSSched/Remote.pm b/src/backend/BSSched/Remote.pm
@@ -414,7 +414,7 @@ sub addrepo_remote_resume {
   my $gctx = $ctx->{'gctx'};
   my $pool = BSSolv::pool->new();
   my $r = addrepo_remote_unpackcpio($gctx, $pool, $handle->{'_prp'}, $handle->{'_arch'}, $cpio, $handle->{'_solvok'}, $handle->{'_modules'}, $error);
-  $ctx->setchanged($handle) unless !$r && $error && BSSched::RPC::is_transient_error($error);
+  $ctx->setchanged_unless_othersinprogress($handle);
 }
 
 sub import_annotation {
@@ -628,7 +628,7 @@ sub read_gbininfo_remote_resume {
   my ($ctx, $handle, $error, $packagebinarylist) = @_;
   my $gctx = $ctx->{'gctx'};
   convertpackagebinarylist($gctx, $handle->{'_prpa'}, $packagebinarylist, $error, $ctx->{'prp'}, $handle->{'_isgbininfo'});
-  $ctx->setchanged($handle);
+  $ctx->setchanged_unless_othersinprogress($handle);
 }
 
 sub convertpackagebinarylist {