Fixed a typo in r107054

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

diff --git a/maintenance/nextJobDB.php b/maintenance/nextJobDB.php
index 75855bb..70cfdf7 100644 (file)
--- a/maintenance/nextJobDB.php
+++ b/maintenance/nextJobDB.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class nextJobDB extends Maintenance {
        public function __construct() {
@@ -33,20 +33,75 @@ class nextJobDB extends Maintenance {
        public function execute() {
                global $wgMemc;
                $type = $this->getOption( 'type', false );
-               $mckey = $type === false
-                                       ? "jobqueue:dbs"
-                                       : "jobqueue:dbs:$type";
-               $pendingDBs = $wgMemc->get( $mckey );
-
-               # If we didn't get it from the cache
-               if( !$pendingDBs ) {
-                       $pendingDBs = $this->getPendingDbs( $type );
-                       $wgMemc->get( $mckey, $pendingDBs, 300 );
+
+               $memcKey = 'jobqueue:dbs:v2';
+               $pendingDBs = $wgMemc->get( $memcKey );
+
+               // If the cache entry wasn't present, or in 1% of cases otherwise,
+               // regenerate the cache.
+               if ( !$pendingDBs || mt_rand( 0, 100 ) == 0 ) {
+                       $pendingDBs = $this->getPendingDbs();
+                       $wgMemc->set( $memcKey, $pendingDBs, 300 );
                }
-               # If we've got a pending job in a db, display it.
-               if ( $pendingDBs ) {
-                       $this->output( $pendingDBs[mt_rand(0, count( $pendingDBs ) - 1)] );
+
+               if ( !$pendingDBs ) {
+                       return;
+               }
+
+               do {
+                       $again = false;
+
+                       if ( $type === false ) {
+                               $candidates = call_user_func_array( 'array_merge', $pendingDBs );
+                       } elseif ( isset( $pendingDBs[$type] ) ) {
+                               $candidates = $pendingDBs[$type];
+                       } else {
+                               $candidates = array();
+                       }
+                       if ( !$candidates ) {
+                               return;
+                       }
+
+                       $candidates = array_values( $candidates );
+                       $db = $candidates[ mt_rand( 0, count( $candidates ) - 1 ) ];
+                       if ( !$this->checkJob( $type, $db ) ) {
+                               // This job is not available in the current database. Remove it from
+                               // the cache.
+                               if ( $type === false ) {
+                                       foreach ( $pendingDBs as $type2 => $dbs ) {
+                                               $pendingDBs[$type2] = array_diff( $pendingDBs[$type2], array( $db ) );
+                                       }
+                               } else {
+                                       $pendingDBs[$type] = array_diff( $pendingDBs[$type], array( $db ) );
+                               }
+
+                               $wgMemc->set( $memcKey, $pendingDBs, 300 );
+                               $again = true;
+                       }
+               } while ( $again );
+
+               $this->output( $db . "\n" );
+       }
+
+       /**
+        * Check if the specified database has a job of the specified type in it.
+        * The type may be false to indicate "all".
+        * @param $type string
+        * @param $dbName string
+        * @return bool
+        */
+       function checkJob( $type, $dbName ) {
+               $lb = wfGetLB( $dbName );
+               $db = $lb->getConnection( DB_MASTER, array(), $dbName );
+               if ( $type === false ) {
+                       $conds = array();
+               } else {
+                       $conds = array( 'job_cmd' => $type );
                }
+
+               $exists = (bool) $db->selectField( 'job', '1', $conds, __METHOD__ );
+               $lb->reuseConnection( $db );
+               return $exists;
        }
 
        /**
@@ -54,22 +109,22 @@ class nextJobDB extends Maintenance {
         * @param $type String Job type
         * @return array
         */
-       private function getPendingDbs( $type ) {
+       private function getPendingDbs() {
                global $wgLocalDatabases;
                $pendingDBs = array();
                # Cross-reference DBs by master DB server
                $dbsByMaster = array();
                foreach ( $wgLocalDatabases as $db ) {
                        $lb = wfGetLB( $db );
-                       $dbsByMaster[$lb->getServerName(0)][] = $db;
+                       $dbsByMaster[$lb->getServerName( 0 )][] = $db;
                }
 
-               foreach ( $dbsByMaster as $master => $dbs ) {
+               foreach ( $dbsByMaster as $dbs ) {
                        $dbConn = wfGetDB( DB_MASTER, array(), $dbs[0] );
-                       $stype = $dbConn->addQuotes( $type );
 
                        # Padding row for MySQL bug
-                       $sql = "(SELECT '-------------------------------------------' as db)";
+                       $pad = str_repeat( '-', 40 );
+                       $sql = "(SELECT '$pad' as db, '$pad' as job_cmd)";
                        foreach ( $dbs as $wikiId ) {
                                if ( $sql != '' ) {
                                        $sql .= ' UNION ';
@@ -79,10 +134,7 @@ class nextJobDB extends Maintenance {
                                $dbConn->tablePrefix( $tablePrefix );
                                $jobTable = $dbConn->tableName( 'job' );
 
-                               if ( $type === false )
-                                       $sql .= "(SELECT '$wikiId' as db FROM $dbName.$jobTable LIMIT 1)";
-                               else
-                                       $sql .= "(SELECT '$wikiId' as db FROM $dbName.$jobTable WHERE job_cmd=$stype LIMIT 1)";
+                               $sql .= "(SELECT DISTINCT '$wikiId' as db, job_cmd FROM $dbName.$jobTable GROUP BY job_cmd)";
                        }
                        $res = $dbConn->query( $sql, __METHOD__ );
                        $first = true;
@@ -92,7 +144,7 @@ class nextJobDB extends Maintenance {
                                        $first = false;
                                        continue;
                                }
-                               $pendingDBs[] = $row->db;
+                               $pendingDBs[$row->job_cmd][] = $row->db;
                        }
                }
                return $pendingDBs;
@@ -100,4 +152,4 @@ class nextJobDB extends Maintenance {
 }
 
 $maintClass = "nextJobDb";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );