[backend] proxy the missingdodresources request through the src server

This is the only POST request from the scheduler to a repo server. It currently gets rejected due to our access configuration, so use the src server as proxy.
openSUSE · May 31, 2021 · 32d90d2 · 32d90d2
1 parent ef5f0e0
commit 32d90d2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/backend/BSSched/DoD.pm b/src/backend/BSSched/DoD.pm
@@ -432,9 +432,8 @@ sub signalmissing {
     my $proj = $remoteprojs->{$projid};
     return unless $proj;
     return unless $proj->{'partition'};		# not supported yet
-    my $server = $proj->{'partition'} ? $proj->{'remoteurl'} : $BSConfig::srcserver;
     my $param = {
-      'uri' => "$server/build/$prp/$arch",
+      'uri' => "$BSConfig::srcserver/build/$prp/$arch/_repository",
       'request' => 'POST',
       'receiver' => \&BSHTTP::null_receiver,
       'async' => {
@@ -443,7 +442,7 @@ sub signalmissing {
         '_prp' => $prp,
       },
     };
-    my @args = 'view=missingdodresources';
+    my @args = 'cmd=missingdodresources';
     push @args, map {"resource=$_"} @$dodresources;
     push @args, "partition=$BSConfig::partition" if $BSConfig::partition;
     eval { $ctx->xrpc("missingdodresources/$prp", $param, undef, @args) };

diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver
@@ -5436,6 +5436,21 @@ sub postrepo {
   return ($res, $BSXML::collection);
 }
 
+sub missingdodresources {
+  my ($cgi, $projid, $repoid, $arch) = @_;
+  checkprojrepoarch($projid, $repoid, $arch);
+  my $reposerver = $BSConfig::partitioning ? BSSrcServer::Partition::projid2reposerver($projid) : $BSConfig::reposerver;
+  my $param = {
+    'uri' => "$reposerver/build/$projid/$repoid/$arch/_repository",
+    'request' => 'POST',
+    'ignorestatus' => 1,
+    'receiver' => \&BSServer::reply_receiver,
+  };
+  my @args = BSRPC::args($cgi, 'resource', 'partition');
+  BSWatcher::rpc($param, undef, 'cmd=missingdodresources', @args);
+  return undef;
+}
+
 ####################################################################
 
 sub service {
@@ -7218,6 +7233,7 @@ my $dispatches = [
   '/build/$project/$repository/$arch package* view:?' => \&getpackagelist_build,
   '!- /build/$project/$repository/$arch/_builddepinfo package* view:?' => \&getbuilddepinfo,
   '/build/$project/$repository/$arch/_jobhistory package* code:* limit:num? endtime_start:num? endtime_end:num?' => \&getjobhistory,
+  'POST:/build/$project/$repository/$arch/_repository cmd=missingdodresources resource:* partition:?' => \&missingdodresources,
   'POST:/build/$project/$repository/$arch/_repository match:' =>  \&postrepo,
   'POST:/build/$project/$repository/$arch/$package cmd=copy oproject:project? opackage:package? orepository:repository? setupdateinfoid:? resign:bool? setrelease:? multibuild:bool?' => \&copybuild,
   'POST:/build/$project/$repository/$arch/$package' => \&uploadbuild,