* (bug 10132, 10134) Restore back-compatibility Image::imageUrl() function

[lhc/web/wiklou.git] / includes / LoadBalancer.php

diff --git a/includes/LoadBalancer.php b/includes/LoadBalancer.php
index a68e942..4ebe26c 100644 (file)
--- a/includes/LoadBalancer.php
+++ b/includes/LoadBalancer.php
@@ -1,7 +1,6 @@
 <?php
 /**
  *
- * @package MediaWiki
  */
 
 
@@ -9,7 +8,6 @@
  * Database load balancing object
  *
  * @todo document
- * @package MediaWiki
  */
 class LoadBalancer {
        /* private */ var $mServers, $mConnections, $mLoads, $mGroupLoads;
@@ -24,7 +22,7 @@ class LoadBalancer {
         */
        const AVG_STATUS_POLL = 2000;
 
-       function LoadBalancer( $servers, $failFunction = false, $waitTimeout = 10, $waitForMasterNow = false )
+       function __construct( $servers, $failFunction = false, $waitTimeout = 10, $waitForMasterNow = false )
        {
                $this->mServers = $servers;
                $this->mFailFunction = $failFunction;
@@ -32,7 +30,7 @@ class LoadBalancer {
                $this->mWriteIndex = -1;
                $this->mForce = -1;
                $this->mConnections = array();
-               $this->mLastIndex = 1;
+               $this->mLastIndex = -1;
                $this->mLoads = array();
                $this->mWaitForFile = false;
                $this->mWaitForPos = false;
@@ -97,7 +95,9 @@ class LoadBalancer {
                # Unset excessively lagged servers
                $lags = $this->getLagTimes();
                foreach ( $lags as $i => $lag ) {
-                       if ( isset( $this->mServers[$i]['max lag'] ) && $lag > $this->mServers[$i]['max lag'] ) {
+                       if ( $i != 0 && isset( $this->mServers[$i]['max lag'] ) && 
+                               ( $lag === false || $lag > $this->mServers[$i]['max lag'] ) ) 
+                       {
                                unset( $loads[$i] );
                        }
                }
@@ -141,6 +141,9 @@ class LoadBalancer {
                $i = false;
                if ( $this->mForce >= 0 ) {
                        $i = $this->mForce;
+               } elseif ( count( $this->mServers ) == 1 )  {
+                       # Skip the load balancing if there's only one server
+                       $i = 0;
                } else {
                        if ( $this->mReadIndex >= 0 ) {
                                $i = $this->mReadIndex;
@@ -157,7 +160,7 @@ class LoadBalancer {
                                                $i = $this->getRandomNonLagged( $loads );
                                                if ( $i === false && count( $loads ) != 0 )  {
                                                        # All slaves lagged. Switch to read-only mode
-                                                       $wgReadOnly = wfMsgNoDB( 'readonly_lag' );
+                                                       $wgReadOnly = wfMsgNoDBForContent( 'readonly_lag' );
                                                        $i = $this->pickRandom( $loads );
                                                }
                                        }
@@ -171,10 +174,9 @@ class LoadBalancer {
                                                        unset( $loads[$i] );
                                                        $sleepTime = 0;
                                                } else {
-                                                       $status = $this->mConnections[$i]->getStatus("Thread%");
-                                                       if ( isset( $this->mServers[$i]['max threads'] ) &&
-                                                         $status['Threads_running'] > $this->mServers[$i]['max threads'] )
-                                                       {
+                                                       if ( isset( $this->mServers[$i]['max threads'] ) ) {
+                                                           $status = $this->mConnections[$i]->getStatus("Thread%");
+                                                           if ( $status['Threads_running'] > $this->mServers[$i]['max threads'] ) {
                                                                # Too much load, back off and wait for a while.
                                                                # The sleep time is scaled by the number of threads connected,
                                                                # to produce a roughly constant global poll rate.
@@ -182,9 +184,13 @@ class LoadBalancer {
 
                                                                # If we reach the timeout and exit the loop, don't use it
                                                                $i = false;
-                                                       } else {
+                                                           } else {
                                                                $done = true;
                                                                $sleepTime = 0;
+                                                           }
+                                                       } else {
+                                                           $done = true;
+                                                           $sleepTime = 0;
                                                        }
                                                }
                                        } else {
@@ -498,8 +504,7 @@ class LoadBalancer {
         * Save master pos to the session and to memcached, if the session exists
         */
        function saveMasterPos() {
-               global $wgSessionStarted;
-               if ( $wgSessionStarted && count( $this->mServers ) > 1 ) {
+               if ( session_id() != '' && count( $this->mServers ) > 1 ) {
                        # If this entire request was served from a slave without opening a connection to the
                        # master (however unlikely that may be), then we can fetch the position from the slave.
                        if ( empty( $this->mConnections[0] ) ) {
@@ -599,14 +604,12 @@ class LoadBalancer {
         * Results are cached for a short time in memcached
         */
        function getLagTimes() {
-               global $wgDBname;
-
                wfProfileIn( __METHOD__ );
                $expiry = 5;
                $requestRate = 10;
 
                global $wgMemc;
-               $times = $wgMemc->get( "$wgDBname:lag_times" );
+               $times = $wgMemc->get( wfMemcKey( 'lag_times' ) );
                if ( $times ) {
                        # Randomly recache with probability rising over $expiry
                        $elapsed = time() - $times['timestamp'];
@@ -634,7 +637,7 @@ class LoadBalancer {
 
                # Add a timestamp key so we know when it was cached
                $times['timestamp'] = time();
-               $wgMemc->set( "$wgDBname:lag_times", $times, $expiry );
+               $wgMemc->set( wfMemcKey( 'lag_times' ), $times, $expiry );
 
                # But don't give the timestamp to the caller
                unset($times['timestamp']);