jenkins-bot has submitted this change and it was merged.
Change subject: objectcache: Make SqlBagOStuff::waitForSlaves() no-op without
slaves
......................................................................
objectcache: Make SqlBagOStuff::waitForSlaves() no-op without slaves
Change-Id: Ibaa4745c18c6f4f66edb4c5f190196b575d3b738
---
M includes/objectcache/SqlBagOStuff.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/objectcache/SqlBagOStuff.php
b/includes/objectcache/SqlBagOStuff.php
index 7a89991..73f8280 100644
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -801,6 +801,10 @@
if ( $this->usesMainDB() ) {
$lb = $this->getSeparateMainLB()
?:
MediaWikiServices::getInstance()->getDBLoadBalancer();
+ // Return if there are no slaves
+ if ( $lb->getServerCount() <= 1 ) {
+ return true;
+ }
// Main LB is used; wait for any slaves to catch up
try {
$pos = $lb->getMasterPos();
--
To view, visit https://gerrit.wikimedia.org/r/307643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaa4745c18c6f4f66edb4c5f190196b575d3b738
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
