X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=maintenance%2FMaintenance.php;h=b446cc12b7c67172ad1704013236f0a3db497cdb;hb=32d29b4a681048009d9ce2f986a6ad737b07cc94;hp=63777343d543beee8080c56ee22093ffb88750f4;hpb=38a0733fef96fd2f837144293b902d2e0353c955;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index 63777343d5..b446cc12b7 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -26,7 +26,6 @@ require_once __DIR__ . '/../includes/PHPVersionCheck.php'; wfEntryPointCheck( 'cli' ); use MediaWiki\Shell\Shell; -use Wikimedia\Rdbms\DBReplicationWaitError; /** * @defgroup MaintenanceArchive Maintenance archives @@ -1393,17 +1392,12 @@ 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 ); - - return true; - } catch ( DBReplicationWaitError $e ) { - return false; - } + $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); + $waitSucceeded = $lbFactory->waitForReplication( + [ 'timeout' => 30, 'ifWritesSince' => $this->lastReplicationWait ] + ); + $this->lastReplicationWait = microtime( true ); + return $waitSucceeded; } /**