From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 14 Jun 2018 00:14:23 +0000 (-0700)
Subject: rdbms: disable ChronologyProtector if EmptyBagOStuff is used
X-Git-Tag: 1.34.0-rc.0~5075
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=6a6771e553aa06979dce4d5349e4f4dd54f6063a;p=lhc%2Fweb%2Fwiklou.git

rdbms: disable ChronologyProtector if EmptyBagOStuff is used

Bug: T197206
Change-Id: Ic07634224fac1ae72d1ba20176c028fdda5ba415
---

diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index 130a097c78..ff296c443e 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -505,6 +505,10 @@ abstract class LBFactory implements ILBFactory {
 			// Request opted out of using position wait logic. This is useful for requests
 			// done by the job queue or background ETL that do not have a meaningful session.
 			$this->chronProt->setWaitEnabled( false );
+		} elseif ( $this->memStash instanceof EmptyBagOStuff ) {
+			// No where to store any DB positions and wait for them to appear
+			$this->chronProt->setEnabled( false );
+			$this->replLogger->info( 'Cannot use ChronologyProtector with EmptyBagOStuff.' );
 		}
 
 		$this->replLogger->debug( __METHOD__ . ': using request info ' .