Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce change for deadlocks in Block::insert()

Browse source 
Bug: T96428
Change-Id: Idb266c8de7b5d7d85339ecc58044c28005527c89
This commit is contained in:
Aaron Schulz 2015-04-17 13:04:35 -07:00
parent 4e8eb78d94
commit 89d5f0ef61
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
includes/Block.php
View file

@ -443,11 +443,15 @@ class Block {
$dbw->insert( 'ipblocks', $row, __METHOD__, array( 'IGNORE' ) );
$affected = $dbw->affectedRows();
$this->mId = $dbw->insertId();
# Don't collide with expired blocks.
# Do this after trying to insert to avoid pointless gap locks.
# Do this after trying to insert to avoid locking.
if ( !$affected ) {
$dbw->delete( 'ipblocks',
# T96428: The ipb_address index uses a prefix on a field, so
# use a standard SELECT + DELETE to avoid annoying gap locks.
$ids = $dbw->selectFieldValues( 'ipblocks',
'ipb_id',
array(
'ipb_address' => $row['ipb_address'],
'ipb_user' => $row['ipb_user'],
@ -455,13 +459,14 @@ class Block {
),
__METHOD__
);
$dbw->insert( 'ipblocks', $row, __METHOD__, array( 'IGNORE' ) );
$affected = $dbw->affectedRows();
if ( $ids ) {
$dbw->delete( 'ipblocks', array( 'ipb_id' => $ids ), __METHOD__ );
$dbw->insert( 'ipblocks', $row, __METHOD__, array( 'IGNORE' ) );
$affected = $dbw->affectedRows();
$this->mId = $dbw->insertId();
}
}
$this->mId = $dbw->insertId();
if ( $affected ) {
$auto_ipd_ids = $this->doRetroactiveAutoblock();
return array( 'id' => $this->mId, 'autoIds' => $auto_ipd_ids );