From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 11 Aug 2016 16:40:36 +0000 (-0700)
Subject: Use waitForAll() for slow JobRunner commits
X-Git-Tag: 1.31.0-rc.0~6058^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=4209b81ad0d44d6e7535bab7b030c311cdab9e2a;p=lhc%2Fweb%2Fwiklou.git

Use waitForAll() for slow JobRunner commits

Using waitForOne() barely goes beyond semi-sync replication
already in place on serious DB clusters.

Change-Id: Idb719deaa5993bc2f818cd110d49d09567e0afb3
---

diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index a132dc5204..4b906a7717 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -522,10 +522,10 @@ class JobRunner implements LoggerAwareInterface {
 			// This will trigger a rollback in the main loop
 			throw new DBError( $dbwSerial, "Timed out waiting on commit queue." );
 		}
-		// Wait for the generic slave to catch up
+		// Wait for the slave DBs to catch up
 		$pos = $lb->getMasterPos();
 		if ( $pos ) {
-			$lb->waitForOne( $pos );
+			$lb->waitForAll( $pos );
 		}
 
 		$fname = __METHOD__;