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

Fix broken lockmanager-fail-releaselock status messages

Browse source 
Change-Id: Icb0cfa6e38bc81c35430023afe50dd94ef3b2013
This commit is contained in:
Aaron Schulz 2016-08-23 08:57:28 -07:00
parent b57577469e
commit de1044de2c
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
includes/filebackend/lockmanager/RedisLockManager.php
View file

@ -81,10 +81,12 @@ class RedisLockManager extends QuorumLockManager {
protected function getLocksOnServer( $lockSrv, array $pathsByType ) {
$status = Status::newGood();
$pathList = call_user_func_array( 'array_merge', array_values( $pathsByType ) );
$server = $this->lockServers[$lockSrv];
$conn = $this->redisPool->getConnection( $server );
if ( !$conn ) {
foreach ( array_merge( array_values( $pathsByType ) ) as $path ) {
foreach ( $pathList as $path ) {
$status->fatal( 'lockmanager-fail-acquirelock', $path );
}
@ -157,7 +159,7 @@ LUA;
}
if ( $res === false ) {
foreach ( array_merge( array_values( $pathsByType ) ) as $path ) {
foreach ( $pathList as $path ) {
$status->fatal( 'lockmanager-fail-acquirelock', $path );
}
} else {
@ -172,10 +174,12 @@ LUA;
protected function freeLocksOnServer( $lockSrv, array $pathsByType ) {
$status = Status::newGood();
$pathList = call_user_func_array( 'array_merge', array_values( $pathsByType ) );
$server = $this->lockServers[$lockSrv];
$conn = $this->redisPool->getConnection( $server );
if ( !$conn ) {
foreach ( array_merge( array_values( $pathsByType ) ) as $path ) {
foreach ( $pathList as $path ) {
$status->fatal( 'lockmanager-fail-releaselock', $path );
}
@ -225,7 +229,7 @@ LUA;
}
if ( $res === false ) {
foreach ( array_merge( array_values( $pathsByType ) ) as $path ) {
foreach ( $pathList as $path ) {
$status->fatal( 'lockmanager-fail-releaselock', $path );
}
} else {