keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Alternative item insert lock mechanism

Browse source
This commit is contained in:
Michael 2020-10-24 13:09:35 +00:00
parent 592ac53ffc
commit 58383f38d7
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Model/Item.php
View file

@ -71,6 +71,8 @@ class Item
const PT_FETCHED = 75; const PT_FETCHED = 75;
const PT_PERSONAL_NOTE = 128; const PT_PERSONAL_NOTE = 128;
const LOCK_ITEM = 'item-insert';
// Field list that is used to display the items // Field list that is used to display the items
const DISPLAY_FIELDLIST = [ const DISPLAY_FIELDLIST = [
'uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network', 'gravity', 'uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network', 'gravity',
@ -1884,24 +1886,27 @@ class Item
} }
} }
DBA::lock('item'); if (DI::lock()->acquire(self::LOCK_ITEM, 0)) {
$condition = ['uri-id' => $item['uri-id'], 'uid' => $item['uid'], 'network' => $item['network']]; $condition = ['uri-id' => $item['uri-id'], 'uid' => $item['uid'], 'network' => $item['network']];
if (DBA::exists('item', $condition)) { if (DBA::exists('item', $condition)) {
DBA::unlock(); DI::lock()->release(self::LOCK_ITEM);
Logger::notice('Item is already inserted - aborting', $condition); Logger::notice('Item is already inserted - aborting', $condition);
return 0; return 0;
} }
$ret = DBA::insert('item', $item); $result = DBA::insert('item', $item);
// When the item was successfully stored we fetch the ID of the item. // When the item was successfully stored we fetch the ID of the item.
$current_post = DBA::lastInsertId(); $current_post = DBA::lastInsertId();
DBA::unlock(); DI::lock()->release(self::LOCK_ITEM);
} else {
$result = false;
$current_post = 0;
}
if (!DBA::isResult($ret) || ($current_post == 0)) { if (empty($current_post) || !DBA::isResult($result)) {
// On failure store the data into a spool file so that the "SpoolPost" worker can try again later. // On failure store the data into a spool file so that the "SpoolPost" worker can try again later.
Logger::warning('Could not store item. it will be spooled', ['ret' => $ret, 'id' => $current_post]); Logger::warning('Could not store item. it will be spooled', ['result' => $result, 'id' => $current_post]);
self::spool($orig_item); self::spool($orig_item);
return 0; return 0;
} }