From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 14 Feb 2017 21:47:58 +0000 (-0800)
Subject: Make position time APC key in LoadBalancer more Het-Deploy friendly
X-Git-Tag: 1.31.0-rc.0~4086
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=5719d297dbc83e6e0a1ab59812d7e9b3498f1825;p=lhc%2Fweb%2Fwiklou.git

Make position time APC key in LoadBalancer more Het-Deploy friendly

This avoids two versions of MediaWiki fighting over Rdbms
namespace changes. A simple version string works since there
are no purges issued; it is TTL-based only.

Change-Id: Ie155c20352e8fea00ea469d162d25bda3600ae60
---

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 900a79ca4d..b1c0cc8733 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -488,7 +488,7 @@ class LoadBalancer implements ILoadBalancer {
 
 		// Check if we already know that the DB has reached this point
 		$server = $this->getServerName( $index );
-		$key = $this->srvCache->makeGlobalKey( __CLASS__, 'last-known-pos', $server );
+		$key = $this->srvCache->makeGlobalKey( __CLASS__, 'last-known-pos', $server, 'v1' );
 		/** @var DBMasterPos $knownReachedPos */
 		$knownReachedPos = $this->srvCache->get( $key );
 		if (