From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 6 Sep 2016 06:16:42 +0000 (+0000)
Subject: Merge "Make Maintenance::commitTransaction() avoid using deprecated method"
X-Git-Tag: 1.31.0-rc.0~5753
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24ze_article%22%29%20.%20%22?a=commitdiff_plain;h=ba67060734ecfa835f54c83540c0c136db1690d7;hp=57e19b610dbe6c33984b1b6408ee6906340bf05a;p=lhc%2Fweb%2Fwiklou.git

Merge "Make Maintenance::commitTransaction() avoid using deprecated method"
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 6aa14b8add..6e1f741a81 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -109,7 +109,7 @@ abstract class Maintenance {
 	private $mDb = null;
 
 	/** @var float UNIX timestamp */
-	private $lastSlaveWait = 0.0;
+	private $lastReplicationWait = 0.0;
 
 	/**
 	 * Used when creating separate schema files.
@@ -1276,11 +1276,17 @@ abstract class Maintenance {
 	 */
 	protected function commitTransaction( IDatabase $dbw, $fname ) {
 		$dbw->commit( $fname );
+		try {
+			$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+			$lbFactory->waitForReplication(
+				[ 'timeout' => 30, 'ifWritesSince' => $this->lastReplicationWait ]
+			);
+			$this->lastReplicationWait = microtime( true );
 
-		$ok = wfWaitForSlaves( $this->lastSlaveWait, false, '*', 30 );
-		$this->lastSlaveWait = microtime( true );
-
-		return $ok;
+			return true;
+		} catch ( DBReplicationWaitError $e ) {
+			return false;
+		}
 	}
 
 	/**