Load balancer bug fixes

diff --git a/includes/DatabaseFunctions.php b/includes/DatabaseFunctions.php
index f416176..0169b9f 100644 (file)
--- a/includes/DatabaseFunctions.php
+++ b/includes/DatabaseFunctions.php
@@ -26,6 +26,7 @@ if ($wgDBtype=="mysql") {
 # If errors are explicitly ignored, returns success
 function wfQuery( $sql, $db, $fname = "" )
 {
+       global $wgOut;
        if ( !is_numeric( $db ) ) {
                # Someone has tried to call this the old way
                $wgOut->fatalError( wfMsgNoDB( "wrong_wfQuery_params", $db, $sql ) );

diff --git a/includes/LoadBalancer.php b/includes/LoadBalancer.php
index 1ff454a..94f4f55 100644 (file)
--- a/includes/LoadBalancer.php
+++ b/includes/LoadBalancer.php
@@ -72,7 +72,8 @@ class LoadBalancer {
                foreach ( $weights as $w ) {
                        $sum += $w;
                }
-               $rand = mt_rand() / RAND_MAX * $sum;
+               $max = mt_getrandmax();
+               $rand = mt_rand(0, $max) / $max * $sum;
                
                $sum = 0;
                foreach ( $weights as $i => $w ) {
@@ -96,8 +97,10 @@ class LoadBalancer {
                                # don't work
                                $loads = $this->mLoads;
                                do {
-                                       $i = pickRandom( $loads );
+                                       $i = $this->pickRandom( $loads );
                                        if ( $i !== false ) {
+                                               wfDebug( "Using reader #$i: {$this->mServers[$i]}\n" );
+
                                                $conn =& $this->getConnection( $i );
                                                if ( !$conn->isOpen() ) {
                                                        unset( $loads[$i] );