diff options
Diffstat (limited to 'maintenance/runJobs.php')
-rw-r--r-- | maintenance/runJobs.php | 121 |
1 files changed, 90 insertions, 31 deletions
diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php index e909bc06..429edf42 100644 --- a/maintenance/runJobs.php +++ b/maintenance/runJobs.php @@ -25,7 +25,7 @@ * @ingroup Maintenance */ -require_once( __DIR__ . '/Maintenance.php' ); +require_once __DIR__ . '/Maintenance.php'; /** * Maintenance script that runs pending jobs. @@ -52,14 +52,20 @@ class RunJobs extends Maintenance { public function execute() { global $wgTitle; + + if ( wfReadOnly() ) { + $this->error( "Unable to run jobs; the wiki is in read-only mode.", 1 ); // die + } + if ( $this->hasOption( 'procs' ) ) { $procs = intval( $this->getOption( 'procs' ) ); if ( $procs < 1 || $procs > 1000 ) { $this->error( "Invalid argument to --procs", true ); - } - $fc = new ForkController( $procs ); - if ( $fc->start() != 'child' ) { - exit( 0 ); + } elseif ( $procs != 1 ) { + $fc = new ForkController( $procs ); + if ( $fc->start() != 'child' ) { + exit( 0 ); + } } } $maxJobs = $this->getOption( 'maxjobs', false ); @@ -67,44 +73,97 @@ class RunJobs extends Maintenance { $startTime = time(); $type = $this->getOption( 'type', false ); $wgTitle = Title::newFromText( 'RunJobs.php' ); - $dbw = wfGetDB( DB_MASTER ); - $n = 0; + $jobsRun = 0; // counter - if ( $type === false ) { - $conds = Job::defaultQueueConditions( ); - } else { - $conds = array( 'job_cmd' => $type ); + $group = JobQueueGroup::singleton(); + // Handle any required periodic queue maintenance + $count = $group->executeReadyPeriodicTasks(); + if ( $count > 0 ) { + $this->runJobsLog( "Executed $count periodic queue task(s)." ); } - while ( $dbw->selectField( 'job', 'job_id', $conds, 'runJobs.php' ) ) { - $offset = 0; - for ( ; ; ) { - $job = !$type ? Job::pop( $offset ) : Job::pop_type( $type ); + $flags = JobQueueGroup::USE_CACHE | JobQueueGroup::USE_PRIORITY; + $lastTime = time(); // time since last slave check + do { + $job = ( $type === false ) + ? $group->pop( JobQueueGroup::TYPE_DEFAULT, $flags ) + : $group->pop( $type ); // job from a single queue + if ( $job ) { // found a job + ++$jobsRun; + $this->runJobsLog( $job->toString() . " STARTING" ); + + // Set timer to stop the job if too much CPU time is used + set_time_limit( $maxTime ?: 0 ); + // Run the job... + wfProfileIn( __METHOD__ . '-' . get_class( $job ) ); + $t = microtime( true ); + try { + $status = $job->run(); + $error = $job->getLastError(); + } catch ( MWException $e ) { + $status = false; + $error = get_class( $e ) . ': ' . $e->getMessage(); + $e->report(); // write error to STDERR and the log + } + $timeMs = intval( ( microtime( true ) - $t ) * 1000 ); + wfProfileOut( __METHOD__ . '-' . get_class( $job ) ); + // Disable the timer + set_time_limit( 0 ); - if ( !$job ) { - break; + // Mark the job as done on success or when the job cannot be retried + if ( $status !== false || !$job->allowRetries() ) { + $group->ack( $job ); // done } - wfWaitForSlaves(); - $t = microtime( true ); - $offset = $job->id; - $this->runJobsLog( $job->toString() . " STARTING" ); - $status = $job->run(); - $t = microtime( true ) - $t; - $timeMs = intval( $t * 1000 ); - if ( !$status ) { - $this->runJobsLog( $job->toString() . " t=$timeMs error={$job->error}" ); + if ( $status === false ) { + $this->runJobsLog( $job->toString() . " t=$timeMs error={$error}" ); } else { $this->runJobsLog( $job->toString() . " t=$timeMs good" ); } - if ( $maxJobs && ++$n > $maxJobs ) { - break 2; + // Break out if we hit the job count or wall time limits... + if ( $maxJobs && $jobsRun >= $maxJobs ) { + break; + } elseif ( $maxTime && ( time() - $startTime ) > $maxTime ) { + break; + } + + // Don't let any of the main DB slaves get backed up + $timePassed = time() - $lastTime; + if ( $timePassed >= 5 || $timePassed < 0 ) { + wfWaitForSlaves(); + $lastTime = time(); } - if ( $maxTime && time() - $startTime > $maxTime ) { - break 2; + // Don't let any queue slaves/backups fall behind + if ( $jobsRun > 0 && ( $jobsRun % 100 ) == 0 ) { + $group->waitForBackups(); } + + // Bail if near-OOM instead of in a job + $this->assertMemoryOK(); } + } while ( $job ); // stop when there are no jobs + } + + /** + * Make sure that this script is not too close to the memory usage limit + * @throws MWException + */ + private function assertMemoryOK() { + static $maxBytes = null; + if ( $maxBytes === null ) { + $m = array(); + if ( preg_match( '!^(\d+)(k|m|g|)$!i', ini_get( 'memory_limit' ), $m ) ) { + list( , $num, $unit ) = $m; + $conv = array( 'g' => 1024 * 1024 * 1024, 'm' => 1024 * 1024, 'k' => 1024, '' => 1 ); + $maxBytes = $num * $conv[strtolower( $unit )]; + } else { + $maxBytes = 0; + } + } + $usedBytes = memory_get_usage(); + if ( $maxBytes && $usedBytes >= 0.95 * $maxBytes ) { + throw new MWException( "Detected excessive memory usage ($usedBytes/$maxBytes)." ); } } @@ -119,4 +178,4 @@ class RunJobs extends Maintenance { } $maintClass = "RunJobs"; -require_once( RUN_MAINTENANCE_IF_MAIN ); +require_once RUN_MAINTENANCE_IF_MAIN; |