gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 30172: Prevent race condition when enqueuing a new task 

As we are sending the job to the rabbitmq before in the transaction, the
worker can receive the job to process before the transaction committed.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 40a3294744)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2022-02-24 10:41:16 +01:00 committed by Andrew Fuerste-Henry
parent 58ab6d243b
commit ec67db56f1
2 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Koha/BackgroundJob.pm
View File

@ -101,44 +101,39 @@ sub enqueue {
my $borrowernumber = C4::Context->userenv->{number}; # FIXME Handle non GUI calls
my $json_args = encode_json $job_args;
my $job_id;
$self->_result->result_source->schema->txn_do(
sub {
$self->set(
{
status => 'new',
type => $job_type,
size => $job_size,
data => $json_args,
enqueued_on => dt_from_string,
borrowernumber => $borrowernumber,
}
)->store;
$job_id = $self->id;
$job_args->{job_id} = $job_id;
$json_args = encode_json $job_args;
try {
my $conn = $self->connect;
# This namespace is wrong, it must be a vhost instead.
# But to do so it needs to be created on the server => much more work when a new Koha instance is created.
# Also, here we just want the Koha instance's name, but it's not in the config...
# Picking a random id (memcached_namespace) from the config
my $namespace = C4::Context->config('memcached_namespace');
$conn->send_with_receipt( { destination => sprintf("/queue/%s-%s", $namespace, $job_type), body => $json_args } )
or Koha::Exceptions::Exception->throw('Job has not been enqueued');
} catch {
if ( ref($_) eq 'Koha::Exceptions::Exception' ) {
$_->rethrow;
} else {
warn sprintf "The job has not been sent to the message broker: (%s)", $_;
}
};
$self->set(
{
status => 'new',
type => $job_type,
size => $job_size,
data => $json_args,
enqueued_on => dt_from_string,
borrowernumber => $borrowernumber,
}
);
)->store;
return $job_id;
$job_args->{job_id} = $self->id;
$json_args = encode_json $job_args;
try {
my $conn = $self->connect;
# This namespace is wrong, it must be a vhost instead.
# But to do so it needs to be created on the server => much more work when a new Koha instance is created.
# Also, here we just want the Koha instance's name, but it's not in the config...
# Picking a random id (memcached_namespace) from the config
my $namespace = C4::Context->config('memcached_namespace');
$conn->send_with_receipt( { destination => sprintf("/queue/%s-%s", $namespace, $job_type), body => $json_args } )
or Koha::Exceptions::Exception->throw('Job has not been enqueued');
} catch {
$self->status('failed')->store;
if ( ref($_) eq 'Koha::Exceptions::Exception' ) {
$_->rethrow;
} else {
warn sprintf "The job has not been sent to the message broker: (%s)", $_;
}
};
return $self->id;
}
=head3 process

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
View File

@ -14,6 +14,8 @@
Started
[% CASE "running" %]
Running
[% CASE "failed" %]
Failed
[% CASE # Default case %]
[% job.status | html %]
[% END -%]