jenkins-bot has submitted this change and it was merged. Change subject: Use waitForAll() for slow JobRunner commits ......................................................................
Use waitForAll() for slow JobRunner commits Using waitForOne() barely goes beyond semi-sync replication already in place on serious DB clusters. Change-Id: Idb719deaa5993bc2f818cd110d49d09567e0afb3 --- M includes/jobqueue/JobRunner.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php index a132dc5..4b906a7 100644 --- a/includes/jobqueue/JobRunner.php +++ b/includes/jobqueue/JobRunner.php @@ -522,10 +522,10 @@ // 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__; -- To view, visit https://gerrit.wikimedia.org/r/304258 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idb719deaa5993bc2f818cd110d49d09567e0afb3 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: Catrope <roan.katt...@gmail.com> Gerrit-Reviewer: PleaseStand <pleasest...@live.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits