From 55db32c6bd4180aa8f1802d08d685471e0fd23ca Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 13 Sep 2023 17:03:32 +0000 Subject: [PATCH] Bug 34678: Allow new entries to overwrite hold_fill_targets When using background jobs, there is a possibility of a race condition where two jobs will be updating the holds queue for the same biblio. We should try to minimize those cases (see bug 34596) In the meantime though, we should prevent jobs possibly dying, and allow the most recent update to succeed. There is a possibility two updates wil assign different items to the same reserve, and that a reserve could end up in the queue twice, however, whichever one is filled first will delete both entries. as filling the hold deletes by reserve id (see bug 24359) This patch adds a transaction to delete and then inset the new row To test: 1 - prove -v t/db_dependent/Reserves.t 2 - It fails 3 - Apply patch 4 - t/db_dependent/Reserves.t 5 - It succeeds! Signed-off-by: Emily Lamancusa Signed-off-by: Marcel de Rooy (cherry picked from commit bbeab36789d8dd020bc5395d76c54cc2910caf49) Signed-off-by: Fridolin Somers (cherry picked from commit a65964c35b2d38ec7bcd87182e00ae4567aa0ae4) Signed-off-by: Matt Blenkinsop --- C4/HoldsQueue.pm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm index f2a400c651..120439de03 100644 --- a/C4/HoldsQueue.pm +++ b/C4/HoldsQueue.pm @@ -788,18 +788,25 @@ sub CreatePicklistFromItemMap { sub AddToHoldTargetMap { my $item_map = shift; - my $dbh = C4::Context->dbh; + my $dbh = C4::Context->dbh; + my $schema = Koha::Database->new->schema; my $insert_sql = q( - INSERT INTO hold_fill_targets (borrowernumber, biblionumber, itemnumber, source_branchcode, item_level_request, reserve_id) - VALUES (?, ?, ?, ?, ?, ?) + INSERT INTO hold_fill_targets (borrowernumber, biblionumber, itemnumber, source_branchcode, item_level_request, reserve_id) VALUES (?, ?, ?, ?, ?, ?) ); my $sth_insert = $dbh->prepare($insert_sql); - foreach my $itemnumber (keys %$item_map) { + foreach my $itemnumber ( keys %$item_map ) { my $mapped_item = $item_map->{$itemnumber}; - $sth_insert->execute($mapped_item->{borrowernumber}, $mapped_item->{biblionumber}, $itemnumber, - $mapped_item->{holdingbranch}, $mapped_item->{item_level}, $mapped_item->{reserve_id}); + $schema->txn_do( + sub { + $dbh->do( 'DELETE FROM hold_fill_targets WHERE itemnumber = ?', {}, $itemnumber ); + $sth_insert->execute( + $mapped_item->{borrowernumber}, $mapped_item->{biblionumber}, $itemnumber, + $mapped_item->{holdingbranch}, $mapped_item->{item_level}, $mapped_item->{reserve_id} + ); + } + ); } } -- 2.39.5