Merge "Added a hasMasterConnection() method to LoadBalancer"

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index fc99b58..feca005 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3815,7 +3815,7 @@ function wfWaitForSlaves( $ifWritesSince = false, $wiki = false, $cluster = fals
        // bug 27975 - Don't try to wait for slaves if there are none
        // Prevents permission error when getting master position
        if ( $lb->getServerCount() > 1 ) {
-               if ( $ifWritesSince && !$lb->isOpen( DB_MASTER ) ) {
+               if ( $ifWritesSince && !$lb->hasMasterConnection() ) {
                        return; // assume no writes done
                }
                $dbw = $lb->getConnection( DB_MASTER, array(), $wiki );

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 5353288..01440f4 100644 (file)
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -948,6 +948,14 @@ class LoadBalancer {
                }
        }
 
+       /**
+        * @return bool Whether a master connection is already open
+        * @since 1.24
+        */
+       function hasMasterConnection() {
+               return $this->isOpen( $this->getWriterIndex() );
+       }
+
        /**
         * Determine if there are any pending changes that need to be rolled back
         * or committed.