Use wfGetLB()->getServerCount() to get the server count, not $wgDBservers

[lhc/web/wiklou.git] / maintenance / fixSlaveDesync.php

diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php
index c07ee0d..0d91f54 100644 (file)
--- a/maintenance/fixSlaveDesync.php
+++ b/maintenance/fixSlaveDesync.php
@@ -28,11 +28,10 @@ class FixSlaveDesync extends Maintenance {
        }
        
        public function execute() {
-               global $slaveIndexes, $wgDBservers;
-               $slaveIndexes = array();
-               for ( $i = 1; $i < count( $wgDBservers ); $i++ ) {
+               $this->slaveIndexes = array();
+               for ( $i = 1; $i < wfGetLB()->getServerCount(); $i++ ) {
                        if ( wfGetLB()->isNonZeroLoad( $i ) ) {
-                               $slaveIndexes[] = $i;
+                               $this->slaveIndexes[] = $i;
                        }
                }
 
@@ -66,10 +65,8 @@ class FixSlaveDesync extends Maintenance {
                        }
                }
                $this->output( "\n" );
-               $dbw->freeResult( $res );
 
-               global $slaveIndexes;
-               foreach ( $slaveIndexes as $i ) {
+               foreach ( $this->slaveIndexes as $i ) {
                        $db = wfGetDB( $i );
                        $res = $db->select( 'page', array( 'page_id', 'page_latest' ), array( 'page_id<6054123' ), __METHOD__ );
                        foreach ( $res as $row ) {
@@ -78,7 +75,6 @@ class FixSlaveDesync extends Maintenance {
                                        $this->output( $row->page_id . "\t" );
                                }
                        }
-                       $db->freeResult( $res );
                }
                $this->output( "\n" );
                return $desync;
@@ -89,8 +85,6 @@ class FixSlaveDesync extends Maintenance {
         * @param $pageID int The page_id to fix
         */
        private function desyncFixPage( $pageID ) {
-               global $slaveIndexes;
-
                # Check for a corrupted page_latest
                $dbw = wfGetDB( DB_MASTER );
                $dbw->begin();
@@ -98,7 +92,7 @@ class FixSlaveDesync extends Maintenance {
                        __METHOD__, 'FOR UPDATE' );
                # list( $masterFile, $masterPos ) = $dbw->getMasterPos();
                $found = false;
-               foreach ( $slaveIndexes as $i ) {
+               foreach ( $this->slaveIndexes as $i ) {
                        $db = wfGetDB( $i );
                        /*
                        if ( !$db->masterPosWait( $masterFile, $masterPos, 10 ) ) {
@@ -128,14 +122,12 @@ class FixSlaveDesync extends Maintenance {
                foreach ( $res as $row ) {
                        $masterIDs[] = $row->rev_id;
                }
-               $dbw->freeResult( $res );
 
                $res = $db->select( 'revision', array( 'rev_id' ), array( 'rev_page' => $pageID ), __METHOD__ );
                $slaveIDs = array();
                foreach ( $res as $row ) {
                        $slaveIDs[] = $row->rev_id;
                }
-               $db->freeResult( $res );
                if ( count( $masterIDs ) < count( $slaveIDs ) ) {
                        $missingIDs = array_diff( $slaveIDs, $masterIDs );
                        if ( count( $missingIDs ) ) {
@@ -174,7 +166,7 @@ class FixSlaveDesync extends Maintenance {
                                                $dbw->insert( 'revision', get_object_vars( $row ), __METHOD__, 'IGNORE' );
                                        }
                                } else {
-                                       foreach ( $slaveIndexes as $i ) {
+                                       foreach ( $this->slaveIndexes as $i ) {
                                                $db = wfGetDB( $i );
                                                $db->insert( 'revision', get_object_vars( $row ), __METHOD__, 'IGNORE' );
                                        }
@@ -185,7 +177,7 @@ class FixSlaveDesync extends Maintenance {
                                if ( $toMaster ) {
                                        $dbw->insert( 'text', get_object_vars( $row ), __METHOD__, 'IGNORE' );
                                } else {
-                                       foreach ( $slaveIndexes as $i ) {
+                                       foreach ( $this->slaveIndexes as $i ) {
                                                $db = wfGetDB( $i );
                                                $db->insert( 'text', get_object_vars( $row ), __METHOD__, 'IGNORE' );
                                        }
@@ -199,7 +191,7 @@ class FixSlaveDesync extends Maintenance {
                        if ( $toMaster ) {
                                # $dbw->update( 'page', array( 'page_latest' => $realLatest ), array( 'page_id' => $pageID ), __METHOD__ );
                        } else {
-                               foreach ( $slaveIndexes as $i ) {
+                               foreach ( $this->slaveIndexes as $i ) {
                                        $db = wfGetDB( $i );
                                        $db->update( 'page', array( 'page_latest' => $realLatest ), array( 'page_id' => $pageID ), __METHOD__ );
                                }