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

Made LocalFile::loadExtraFromDB() handle re-upload race conditions

Browse source 
Change-Id: I99a39c3d2b5d7a227be9b11a2f23c534ea4739d9
This commit is contained in:
Aaron Schulz 2014-04-22 09:38:51 -07:00
parent 9a07723b1b
commit 3eced85d60
1 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
includes/filerepo/file/LocalFile.php
View file

@ -417,19 +417,13 @@ class LocalFile extends File {
# Unconditionally set loaded=true, we don't want the accessors constantly rechecking
$this->extraDataLoaded = true;
$dbr = $this->repo->getSlaveDB();
// In theory the file could have just been renamed/deleted...oh well
$row = $dbr->selectRow( 'image', $this->getLazyCacheFields( 'img_' ),
array( 'img_name' => $this->getName() ), $fname );
if ( !$row ) { // fallback to master
$dbr = $this->repo->getMasterDB();
$row = $dbr->selectRow( 'image', $this->getLazyCacheFields( 'img_' ),
array( 'img_name' => $this->getName() ), $fname );
$fieldMap = $this->loadFieldsWithTimestamp( $this->repo->getSlaveDB(), $fname );
if ( !$fieldMap ) {
$fieldMap = $this->loadFieldsWithTimestamp( $this->repo->getMasterDB(), $fname );
}
if ( $row ) {
foreach ( $this->unprefixRow( $row, 'img_' ) as $name => $value ) {
if ( $fieldMap ) {
foreach ( $fieldMap as $name => $value ) {
$this->$name = $value;
}
} else {
@ -440,6 +434,32 @@ class LocalFile extends File {
wfProfileOut( $fname );
}
/**
* @param DatabaseBase $dbr
* @param string $fname
* @return array|false
*/
private function loadFieldsWithTimestamp( $dbr, $fname ) {
$fieldMap = false;
$row = $dbr->selectRow( 'image', $this->getLazyCacheFields( 'img_' ),
array( 'img_name' => $this->getName(), 'img_timestamp' => $this->getTimestamp() ),
$fname );
if ( $row ) {
$fieldMap = $this->unprefixRow( $row, 'img_' );
} else {
# File may have been uploaded over in the meantime; check the old versions
$row = $dbr->selectRow( 'oldimage', $this->getLazyCacheFields( 'oi_' ),
array( 'oi_name' => $this->getName(), 'oi_timestamp' => $this->getTimestamp() ),
$fname );
if ( $row ) {
$fieldMap = $this->unprefixRow( $row, 'oi_' );
}
}
return $fieldMap;
}
/**
* @param array $row Row
* @param string $prefix
@ -1911,10 +1931,14 @@ class LocalFile extends File {
$key = $this->repo->getSharedCacheKey( 'file-volatile', md5( $this->getName() ) );
if ( $key ) {
if ( $this->lastMarkedVolatile && ( time() - $this->lastMarkedVolatile ) <= self::VOLATILE_TTL ) {
if ( $this->lastMarkedVolatile
&& ( time() - $this->lastMarkedVolatile ) <= self::VOLATILE_TTL
) {
return true; // sanity
}
return ( $wgMemc->get( $key ) !== false );
$volatileTimestamp = (int)$wgMemc->get( $key );
$this->lastMarkedVolatile = max( $this->lastMarkedVolatile, $volatileTimestamp );
return ( $volatileTimestamp != 0 );
}
return false;