Bugzilla – Attachment 145067 Details for
Bug 32558
Allow background_jobs_worker.pl to process multiple jobs simultaneously up to a limit
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32558: Add ability for background_jobs_worker.pl to process multiple jobs simultaneously up to a limit
Bug-32558-Add-ability-for-backgroundjobsworkerpl-t.patch (text/plain), 4.27 KB, created by
Kyle M Hall (khall)
on 2023-01-05 16:40:53 UTC
(
hide
)
Description:
Bug 32558: Add ability for background_jobs_worker.pl to process multiple jobs simultaneously up to a limit
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2023-01-05 16:40:53 UTC
Size:
4.27 KB
patch
obsolete
>From 083f673d265b89eefad711da95c909a164b33f5e Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Tue, 3 Jan 2023 15:35:42 +0000 >Subject: [PATCH] Bug 32558: Add ability for background_jobs_worker.pl to > process multiple jobs simultaneously up to a limit > >Right now background_jobs_worker.pl only processes jobs in serial. It would make sense to handle jobs in parallel up to a user definable limit. > >Test Plan: >1) Apply this patch >2) Stop background_jobs_worker.pl >3) Generate some background jobs by editing records, placing holds, etc >4) Watch processes in a new terminal: watch -n 0.1 'ps aux | grep background_jobs_worker.pl' >5) Run background_jobs_worker.pl with parameter -p 3 or some other > number of max processes >6) Note the multiple forked processes in the ps output >--- > debian/templates/koha-conf-site.xml.in | 5 ++++ > etc/koha-conf.xml | 5 ++++ > misc/background_jobs_worker.pl | 35 +++++++++++++------------- > 3 files changed, 27 insertions(+), 18 deletions(-) > >diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in >index bdb994c517..187150fa6a 100644 >--- a/debian/templates/koha-conf-site.xml.in >+++ b/debian/templates/koha-conf-site.xml.in >@@ -457,6 +457,11 @@ __END_SRU_PUBLICSERVER__ > <vhost>__MESSAGE_BROKER_VHOST__</vhost> > </message_broker> > >+ <background_jobs_worker> >+ <!-- Max simultaneous processes per worker --> >+ <max_processes>1</max_processes> >+ </background_jobs_worker> >+ > <do_not_remove_cookie>__KEEP_COOKIE__</do_not_remove_cookie> > <do_not_remove_cookie>catalogue_editor_\d+</do_not_remove_cookie> > <!-- Uncomment lines like hereunder to not clear cookies at logout: >diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml >index 3e5623cb96..beb5ccd80c 100644 >--- a/etc/koha-conf.xml >+++ b/etc/koha-conf.xml >@@ -274,6 +274,11 @@ > <vhost></vhost> > </message_broker> > >+ <background_jobs_worker> >+ <!-- Max simultaneous processes per worker --> >+ <max_processes>1</max_processes> >+ </background_jobs_worker> >+ > <do_not_remove_cookie>catalogue_editor_\d+</do_not_remove_cookie> > <!-- Uncomment lines like hereunder to not clear cookies at logout: > The cookie name is case sensitive. >diff --git a/misc/background_jobs_worker.pl b/misc/background_jobs_worker.pl >index de7dc34aba..0120146a71 100755 >--- a/misc/background_jobs_worker.pl >+++ b/misc/background_jobs_worker.pl >@@ -52,11 +52,19 @@ use JSON qw( decode_json ); > use Try::Tiny qw( catch try ); > use Pod::Usage; > use Getopt::Long; >+use Parallel::ForkManager; > > use Koha::BackgroundJobs; >+use C4::Context; > > my ( $help, @queues ); >+ >+my $max_processes = $ENV{MAX_PROCESSES}; >+$max_processes ||= C4::Context->config('background_jobs_worker')->{max_processes} if C4::Context->config('background_jobs_worker'); >+$max_processes ||= 1; >+ > GetOptions( >+ 'm|max-processes=i' => \$max_processes, > 'h|help' => \$help, > 'queue=s' => \@queues, > ) || pod2usage(1); >@@ -74,6 +82,9 @@ try { > warn sprintf "Cannot connect to the message broker, the jobs will be processed anyway (%s)", $_; > }; > >+my $pm = Parallel::ForkManager->new($max_processes); >+$SIG{CHLD} = sub { $pm->reap_finished_children }; >+ > if ( $conn ) { > # FIXME cf note in Koha::BackgroundJob about $namespace > my $namespace = C4::Context->config('memcached_namespace'); >@@ -97,31 +108,19 @@ while (1) { > my $job = Koha::BackgroundJobs->find($args->{job_id}); > > $conn->ack( { frame => $frame } ); # Acknowledge the message was recieved >- process_job( $job, $args ); >+ $pm->start and next; >+ $job->process( { job_id => $job->id, %$args } ); >+ $pm->finish; > > } else { > my $jobs = Koha::BackgroundJobs->search({ status => 'new', queue => \@queues }); > while ( my $job = $jobs->next ) { >+ $pm->start and next; > my $args = $job->json->decode($job->data); >- process_job( $job, { job_id => $job->id, %$args } ); >+ $job->process( { job_id => $job->id, %$args } ); >+ $pm->finish; > } > sleep 10; > } > } > $conn->disconnect; >- >-sub process_job { >- my ( $job, $args ) = @_; >- >- my $pid; >- if ( $pid = fork ) { >- wait; >- return; >- } >- >- die "fork failed!" unless defined $pid; >- >- $job->process( $args ); >- >- exit; >-} >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 32558
:
144946
|
144947
|
144960
|
144961
|
145043
|
145062
|
145067
|
145900
|
145901
|
145950
|
146020
|
146753
|
146754
|
147784
|
147828