Many files were in the autoloader despite having potentially harmful file-scope code. * Exclude all CommandLineInc maintenance scripts from the autoloader. * Introduce "NO_AUTOLOAD" tag which excludes the file containing it from the autoloader. Use it on CommandLineInc.php and a few suspicious-looking files without classes in case they are refactored to add classes in the future. * Add a test which parses all non-PSR4 class files and confirms that they do not contain dangerous file-scope code. It's slow (15s) but its results were enlightening. * Several maintenance scripts define constants in the file scope, intending to modify the behaviour of MediaWiki. Either move the define() to a later setup function, or protect with NO_AUTOLOAD. * Use require_once consistently with Maintenance.php and doMaintenance.php, per the original convention which is supposed to allow one maintenance script to use the class of another maintenance script. Using require breaks autoloading of these maintenance class files. * When Maintenance.php is included, check if MediaWiki has already started, and if so, return early. Revert the fix for T250003 which is incompatible with this safety measure. Hopefully it was superseded by splitting out the class file. * In runScript.php add a redundant PHP_SAPI check since it does some things in file-scope code before any other check will be run. * Change the if(false) class_alias(...) to something more hackish and more compatible with the new test. * Some site-related scripts found Maintenance.php in a non-standard way. Use the standard way. * fileOpPerfTest.php called error_reporting(). Probably debugging code left in; removed. * Moved mediawiki.compress.7z registration from the class file to the caller. Change-Id: I1b1be90343a5ab678df6f1b1bdd03319dcf6537f
130 lines
3.7 KiB
PHP
130 lines
3.7 KiB
PHP
<?php
|
|
/**
|
|
* Run pending jobs.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*
|
|
* @file
|
|
* @ingroup Maintenance
|
|
*/
|
|
|
|
require_once __DIR__ . '/Maintenance.php';
|
|
|
|
use MediaWiki\MediaWikiServices;
|
|
|
|
/**
|
|
* Maintenance script that runs pending jobs.
|
|
*
|
|
* @ingroup Maintenance
|
|
*/
|
|
class RunJobs extends Maintenance {
|
|
public function __construct() {
|
|
parent::__construct();
|
|
$this->addDescription( 'Run pending jobs' );
|
|
$this->addOption( 'maxjobs', 'Maximum number of jobs to run', false, true );
|
|
$this->addOption( 'maxtime', 'Maximum amount of wall-clock time', false, true );
|
|
$this->addOption( 'type', 'Type of job to run', false, true );
|
|
$this->addOption( 'procs', 'Number of processes to use', false, true );
|
|
$this->addOption( 'nothrottle', 'Ignore job throttling configuration', false, false );
|
|
$this->addOption( 'result', 'Set to "json" to print only a JSON response', false, true );
|
|
$this->addOption( 'wait', 'Wait for new jobs instead of exiting', false, false );
|
|
}
|
|
|
|
public function finalSetup() {
|
|
// So extensions (and other code) can check whether they're running in job mode.
|
|
// This is not defined if this script is included from installer/updater or phpunit.
|
|
define( 'MEDIAWIKI_JOB_RUNNER', true );
|
|
parent::finalSetup();
|
|
}
|
|
|
|
public function memoryLimit() {
|
|
if ( $this->hasOption( 'memory-limit' ) ) {
|
|
return parent::memoryLimit();
|
|
}
|
|
|
|
// Don't eat all memory on the machine if we get a bad job.
|
|
return "150M";
|
|
}
|
|
|
|
public function execute() {
|
|
if ( $this->hasOption( 'procs' ) ) {
|
|
$procs = intval( $this->getOption( 'procs' ) );
|
|
if ( $procs < 1 || $procs > 1000 ) {
|
|
$this->fatalError( "Invalid argument to --procs" );
|
|
} elseif ( $procs != 1 ) {
|
|
$fc = new ForkController( $procs );
|
|
if ( $fc->start() != 'child' ) {
|
|
exit( 0 );
|
|
}
|
|
}
|
|
}
|
|
|
|
$outputJSON = ( $this->getOption( 'result' ) === 'json' );
|
|
$wait = $this->hasOption( 'wait' );
|
|
|
|
$runner = MediaWikiServices::getInstance()->getJobRunner();
|
|
if ( !$outputJSON ) {
|
|
$runner->setDebugHandler( [ $this, 'debugInternal' ] );
|
|
}
|
|
|
|
$type = $this->getOption( 'type', false );
|
|
$maxJobs = $this->getOption( 'maxjobs', false );
|
|
$maxTime = $this->getOption( 'maxtime', false );
|
|
$throttle = !$this->hasOption( 'nothrottle' );
|
|
|
|
while ( true ) {
|
|
$response = $runner->run( [
|
|
'type' => $type,
|
|
'maxJobs' => $maxJobs,
|
|
'maxTime' => $maxTime,
|
|
'throttle' => $throttle,
|
|
] );
|
|
|
|
if ( $outputJSON ) {
|
|
$this->output( FormatJson::encode( $response, true ) );
|
|
}
|
|
|
|
if (
|
|
!$wait ||
|
|
$response['reached'] === 'time-limit' ||
|
|
$response['reached'] === 'job-limit' ||
|
|
$response['reached'] === 'memory-limit'
|
|
) {
|
|
// If job queue is empty, output it
|
|
if ( !$outputJSON && $response['jobs'] === [] ) {
|
|
$this->output( "Job queue is empty.\n" );
|
|
}
|
|
break;
|
|
}
|
|
|
|
if ( $maxJobs !== false ) {
|
|
$maxJobs -= count( $response['jobs'] );
|
|
}
|
|
|
|
sleep( 1 );
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @param string $s
|
|
*/
|
|
public function debugInternal( $s ) {
|
|
$this->output( $s );
|
|
}
|
|
}
|
|
|
|
$maintClass = RunJobs::class;
|
|
require_once RUN_MAINTENANCE_IF_MAIN;
|