From fa3b26279caaf8c8199c3036a023f8aba0f2c869 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Wed, 6 Jun 2018 14:50:05 +0200 Subject: [PATCH] [backend] add optional workerid parameters for worker calls This can make it easier to find workers that have a too small disk cache. --- src/backend/bs_getbinariesproxy | 4 ++-- src/backend/bs_srcserver | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/backend/bs_getbinariesproxy b/src/backend/bs_getbinariesproxy index b4dc1bf04b6..a04570a6392 100755 --- a/src/backend/bs_getbinariesproxy +++ b/src/backend/bs_getbinariesproxy @@ -400,8 +400,8 @@ sub hello { my $dispatches = [ '/' => \&hello, - '/getbinaries $project $repository $arch binaries: nometa:bool? metaonly:bool? server:' => \&getbinaries, - '/getpreinstallimage $prpa $hdrmd5:md5 path: sizek:num? server:' => \&getpreinstallimage, + '/getbinaries $project $repository $arch binaries: nometa:bool? metaonly:bool? workerid? server:' => \&getbinaries, + '/getpreinstallimage $prpa $hdrmd5:md5 path: sizek:num? workerid? server:' => \&getpreinstallimage, ]; my $conf = { diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver index b02f2680000..60b5a951c5a 100755 --- a/src/backend/bs_srcserver +++ b/src/backend/bs_srcserver @@ -6342,13 +6342,16 @@ my $dispatches = [ 'POST:/worker cmd=checkconstraints $project $repository $arch $package' => \&checkconstraints, # worker calls - '/getsources $project $package $srcmd5:md5' => \&getsources, - '/getconfig $project $repository path:prp*' => \&getbuildconfig, + '/getsources $project $package $srcmd5:md5 workerid?' => \&getsources, + '/getconfig $project $repository path:prp* workerid?' => \&getbuildconfig, + '/getsslcert $project autoextend:bool? workerid?' => \&getsslcert, + '/getbinaries $project $repository $arch binaries: nometa:bool? workerid?' => \&worker_getbinaries, + '/getbinaryversions $project $repository $arch binaries: nometa:bool? workerid?' => \&worker_getbinaryversions, + # publisher/signer calls '/getsignkey $project withpubkey:bool? autoextend:bool? withalgo:bool?' => \&getsignkey, - '/getsslcert $project autoextend:bool?' => \&getsslcert, - '/getbinaries $project $repository $arch binaries: nometa:bool?' => \&worker_getbinaries, - '/getbinaryversions $project $repository $arch binaries: nometa:bool?' => \&worker_getbinaryversions, + + # event/notification handling '!- /lastevents $filter:* start:num? obsname:?' => \&lastevents, '/lastnotifications start:num? view:? block:bool? noprune:bool?' => \&lastnotifications, '/notificationpayload/$payloadkey:filename' => \&getnotificationpayload,