diff options
author | Dylan William Hardison <dylan@hardison.net> | 2018-03-13 15:45:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-13 15:45:01 +0100 |
commit | 3698ab542ac64fc52a59d1f9e5855893cae87184 (patch) | |
tree | 1dcc3ffb1c26596c0bb73279aabfcd2cb3310ef5 /Bugzilla | |
parent | 7b5a64793f8b4b8d464f5522975ef19a830b2c2e (diff) | |
download | bugzilla-3698ab542ac64fc52a59d1f9e5855893cae87184.tar.gz bugzilla-3698ab542ac64fc52a59d1f9e5855893cae87184.tar.xz |
Bug 1441181 - Step 6 - Add concurrency
Diffstat (limited to 'Bugzilla')
-rw-r--r-- | Bugzilla/JobQueue/Runner.pm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Bugzilla/JobQueue/Runner.pm b/Bugzilla/JobQueue/Runner.pm index a3cf3ff55..1c74bc28f 100644 --- a/Bugzilla/JobQueue/Runner.pm +++ b/Bugzilla/JobQueue/Runner.pm @@ -28,6 +28,7 @@ use File::Basename; use File::Copy; use File::Spec::Functions qw(catfile); use Future; +use Future::Utils qw(fmap_void); use IO::Async::Loop; use IO::Async::Process; use IO::Async::Signal; @@ -94,6 +95,7 @@ sub gd_more_opt { return ( 'pidfile=s' => \$self->{gd_args}{pidfile}, 'n=s' => \$self->{gd_args}{progname}, + 'jobs|j=i' => \$self->{gd_args}{jobs}, ); } @@ -206,13 +208,18 @@ sub gd_quit_event { FATAL('gd_quit_event() should never be called') } sub gd_reconfig_event { FATAL('gd_reconfig_event() should never be called') } sub gd_run { - my $self = shift; + my $self = shift; + my $jobs = $self->{gd_args}{jobs} // 1; + my $signal_f = $self->{_signal_future}; + my $workers_f = fmap_void { $self->run_worker("work") } + concurrent => $jobs, + generate => sub { !$signal_f->is_ready }; # This is so the process shows up in (h)top in a useful way. local $PROGRAM_NAME = "$self->{gd_progname} [supervisor]"; - my $code = $self->run_worker('work')->get; + Future->wait_any($signal_f, $workers_f)->get; unlink $self->{gd_pidfile}; - exit $code; + exit 0; } # This executes the script "jobqueue-worker.pl" |