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

Merge "objectcache: Warn when WANObjectCache callback returns incomplete result"

Browse source
This commit is contained in:
jenkins-bot 2022-03-24 15:24:54 +00:00 committed by Gerrit Code Review
commit 2b6770a867
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
includes/libs/objectcache/wancache/WANObjectCache.php
View file

@ -2181,12 +2181,13 @@ class WANObjectCache implements
$newTTLsById = array_fill_keys( $idsRegen, $ttl );
$newValsById = $idsRegen ? $callback( $idsRegen, $newTTLsById, $newSetOpts ) : [];
$method = __METHOD__;
// The required callback signature includes $id as the first argument for convenience
// to distinguish different items. To reuse the code in getWithSetCallback(), wrap the
// callback with a proxy callback that has the standard getWithSetCallback() signature.
// This is defined only once per batch to avoid closure creation overhead.
$proxyCb = static function ( $oldValue, &$ttl, &$setOpts, $oldAsOf, $params )
use ( $callback, $newValsById, $newTTLsById, $newSetOpts )
$proxyCb = function ( $oldValue, &$ttl, &$setOpts, $oldAsOf, $params )
use ( $callback, $newValsById, $newTTLsById, $newSetOpts, $method )
{
$id = $params['id'];
@ -2199,7 +2200,16 @@ class WANObjectCache implements
// Pre-emptive/popularity refresh and version mismatch cases are not detected
// above and thus $newValsById has no entry. Run $callback on this single entity.
$ttls = [ $id => $ttl ];
$newValue = $callback( [ $id ], $ttls, $setOpts )[$id];
$result = $callback( [ $id ], $ttls, $setOpts );
if ( !isset( $result[$id] ) ) {
// T303092
$this->logger->warning(
$method . ' failed due to {id} not set in result {result}', [
'id' => $id,
'result' => json_encode( $result )
] );
}
$newValue = $result[$id];
$ttl = $ttls[$id];
}