From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 22 Sep 2016 22:19:17 +0000 (-0700)
Subject: Add DBConnRef sanity check to LoadBalancer::reuseConnection()
X-Git-Tag: 1.31.0-rc.0~5376
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=c607b2e60fce8783655963b502bf03d098857165;p=lhc%2Fweb%2Fwiklou.git

Add DBConnRef sanity check to LoadBalancer::reuseConnection()

Change-Id: I6b079b994f29c5f7953efe73982ef9e6946a21f8
---

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index c030cb20ae..bda185a266 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -597,6 +597,13 @@ class LoadBalancer implements ILoadBalancer {
 			 * should be ignored
 			 */
 			return;
+		} elseif ( $conn instanceof DBConnRef ) {
+			// DBConnRef already handles calling reuseConnection() and only passes the live
+			// Database instance to this method. Any caller passing in a DBConnRef is broken.
+			$this->connLogger->error( __METHOD__ . ": got DBConnRef instance.\n" .
+				( new RuntimeException() )->getTraceAsString() );
+
+			return;
 		}
 
 		$domain = $conn->getDomainID();