From de1044de2c28925eb9b03575480c73463b02217d Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 23 Aug 2016 08:57:28 -0700
Subject: [PATCH] Fix broken lockmanager-fail-releaselock status messages

Change-Id: Icb0cfa6e38bc81c35430023afe50dd94ef3b2013
---
 .../filebackend/lockmanager/RedisLockManager.php     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/includes/filebackend/lockmanager/RedisLockManager.php b/includes/filebackend/lockmanager/RedisLockManager.php
index 6095aeede4..4121ecb29d 100644
--- a/includes/filebackend/lockmanager/RedisLockManager.php
+++ b/includes/filebackend/lockmanager/RedisLockManager.php
@@ -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 {
-- 
2.20.1