Make JobRunner::commitMasterChanges() check getServerCount()

This is a sanity check to avoid problems in waitForOne()

Change-Id: I9792ea8fb69d560bd4adb9bd01515f6456b7e9f3

diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index dd2ef8f..b121dfe 100644 (file)
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -451,7 +451,7 @@ class JobRunner implements LoggerAwareInterface {
                global $wgJobSerialCommitThreshold;
 
                $lb = wfGetLB( wfWikiID() );
-               if ( $wgJobSerialCommitThreshold !== false ) {
+               if ( $wgJobSerialCommitThreshold !== false && $lb->getServerCount() > 1 ) {
                        // Generally, there is one master connection to the local DB
                        $dbwSerial = $lb->getAnyOpenConnection( $lb->getWriterIndex() );
                } else {