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

objectcache: make RedisBagOStuff::incrWithInit() atomic via Lua

Browse source 
Change-Id: Iccddf0f4a0c944ea57b9f570e91c9ab4891bcab1
This commit is contained in:
Aaron Schulz 2019-07-18 11:24:05 -07:00
parent dcd31ad56c
commit 79ea356f1b
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
includes/libs/objectcache/RedisBagOStuff.php
View file

@ -437,28 +437,23 @@ class RedisBagOStuff extends MediumSpecificBagOStuff {
}
$ttl = $this->getExpirationAsTTL( $exptime );
try {
if ( $init === $step && $exptime == self::TTL_INDEFINITE ) {
$newValue = $conn->incrBy( $key, $step );
} else {
$conn->multi( Redis::PIPELINE );
$conn->set(
$key,
(string)( $init - $step ),
$ttl ? [ 'nx', 'ex' => $ttl ] : [ 'nx' ]
);
$conn->incrBy( $key, $step );
$batchResult = $conn->exec();
$newValue = ( $batchResult === false ) ? false : $batchResult[1];
$this->logRequest( 'incrWithInit', $key, $conn->getServer(), $newValue === false );
}
static $script =
/** @lang Lua */
<<<LUA
if redis.call( 'exists', KEYS[1] ) == 1 then
return redis.call( 'incrBy', KEYS[1], ARGV[2] )
end
return redis.call( 'setex', KEYS[1], ARGV[1], ARGV[3] )
LUA;
$result = $conn->eval( $script, [ $key, $ttl, $step, $init ], 1 );
} catch ( RedisException $e ) {
$newValue = false;
$result = false;
$this->handleException( $conn, $e );
}
$this->logRequest( 'incrWithInit', $key, $conn->getServer(), $result );
return $newValue;
return $result;
}
protected function doChangeTTL( $key, $exptime, $flags ) {