Merge "objectcache: Make SqlBagOStuff::waitForSlaves() no-op without slaves"

diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php
index 7a89991..73f8280 100644 (file)
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -801,6 +801,10 @@ class SqlBagOStuff extends BagOStuff {
                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();