From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 10 Mar 2011 05:26:34 +0000 (+0000)
Subject: Add --maxtime parameter to allow job runners to be limited by time instead of job... 
X-Git-Tag: 1.31.0-rc.0~31530
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=0df463c322ae7746c08ae8ab34be078d8bf79904;p=lhc%2Fweb%2Fwiklou.git

Add --maxtime parameter to allow job runners to be limited by time instead of job count. This makes more sense when --procs is used. Using it on Wikimedia will reduce the effect of laggy slaves.
---

diff --git a/maintenance/runJobs.php b/maintenance/runJobs.php
index f601a7e2dd..69c006b542 100644
--- a/maintenance/runJobs.php
+++ b/maintenance/runJobs.php
@@ -31,6 +31,7 @@ class RunJobs extends Maintenance {
 		parent::__construct();
 		$this->mDescription = "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 );
 	}
@@ -52,7 +53,9 @@ class RunJobs extends Maintenance {
 				exit( 0 );
 			}
 		}
-		$maxJobs = $this->getOption( 'maxjobs', 10000 );
+		$maxJobs = $this->getOption( 'maxjobs', false );
+		$maxTime = $this->getOption( 'maxtime', false );
+		$startTime = time();
 		$type = $this->getOption( 'type', false );
 		$wgTitle = Title::newFromText( 'RunJobs.php' );
 		$dbw = wfGetDB( DB_MASTER );
@@ -80,9 +83,13 @@ class RunJobs extends Maintenance {
 				} else {
 					$this->runJobsLog( $job->toString() . " t=$timeMs good" );
 				}
+
 				if ( $maxJobs && ++$n > $maxJobs ) {
 					break 2;
 				}
+				if ( $maxTime && time() - $startTime > $maxTime ) {
+					break 2;
+				}
 			}
 		}
 	}