jenkins-bot has submitted this change and it was merged.
Change subject: Added --status and --limit filters to showJobs.php
......................................................................
Added --status and --limit filters to showJobs.php
Change-Id: Ibb3e907061c04a4dd2af23789fd59685240f0876
---
M maintenance/showJobs.php
1 file changed, 34 insertions(+), 26 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/showJobs.php b/maintenance/showJobs.php
index a989aef..25a096c 100644
--- a/maintenance/showJobs.php
+++ b/maintenance/showJobs.php
@@ -34,42 +34,53 @@
* @ingroup Maintenance
*/
class ShowJobs extends Maintenance {
+ protected static $stateMethods = array(
+ 'unclaimed' => 'getAllQueuedJobs',
+ 'delayed' => 'getAllDelayedJobs',
+ 'claimed' => 'getAllAcquiredJobs',
+ 'abandoned' => 'getAllAbandonedJobs',
+ );
+
public function __construct() {
parent::__construct();
$this->mDescription = "Show number of jobs waiting in master
database";
$this->addOption( 'group', 'Show number of jobs per job type' );
- $this->addOption( 'list',
- 'Show a list of all jobs in a machine-readable format,
instead of statistics' );
+ $this->addOption( 'list', 'Show a list of all jobs instead of
counts' );
$this->addOption( 'type', 'Only show/count jobs of a given
type', false, true );
+ $this->addOption( 'status', 'Filter list by state
(unclaimed,delayed,claimed,abandoned)' );
+ $this->addOption( 'limit', 'Limit of jobs listed' );
}
public function execute() {
- $filterType = $this->getOption( 'type', '' );
+ $typeFilter = $this->getOption( 'type', '' );
+ $stateFilter = $this->getOption( 'status', '' );
+ $stateLimit = (float)$this->getOption( 'limit', INF );
+
$group = JobQueueGroup::singleton();
+
+ $filteredTypes = $typeFilter
+ ? array( $typeFilter )
+ : $group->getQueueTypes();
+ $filteredStates = $stateFilter
+ ? array_intersect_key( self::$stateMethods, array(
$stateFilter => 1 ) )
+ : self::$stateMethods;
+
if ( $this->hasOption( 'list' ) ) {
- foreach ( $group->getQueueTypes() as $type ) {
- if ( $filterType != '' && $type != $filterType
) {
- continue;
- }
+ $count = 0;
+ foreach ( $filteredTypes as $type ) {
$queue = $group->get( $type );
- foreach ( $queue->getAllQueuedJobs() as $job ) {
- $this->output( $job->toString() . "
status=unclaimed\n" );
- }
- foreach ( $queue->getAllDelayedJobs() as $job )
{
- $this->output( $job->toString() . "
status=delayed\n" );
- }
- foreach ( $queue->getAllAcquiredJobs() as $job
) {
- $this->output( $job->toString() . "
status=claimed\n" );
- }
- foreach ( $queue->getAllAbandonedJobs() as $job
) {
- $this->output( $job->toString() . "
status=abandoned\n" );
+ foreach ( $filteredStates as $state => $method
) {
+ foreach ( $queue->$method() as $job ) {
+ /** @var Job $job */
+ $this->output( $job->toString()
. " status=$state\n" );
+ if ( ++$count >= $stateLimit ) {
+ return;
+ }
+ }
}
}
} elseif ( $this->hasOption( 'group' ) ) {
- foreach ( $group->getQueueTypes() as $type ) {
- if ( $filterType != '' && $type != $filterType
) {
- continue;
- }
+ foreach ( $filteredTypes as $type ) {
$queue = $group->get( $type );
$delayed = $queue->getDelayedCount();
$pending = $queue->getSize();
@@ -86,10 +97,7 @@
}
} else {
$count = 0;
- foreach ( $group->getQueueTypes() as $type ) {
- if ( $filterType != '' && $type != $filterType
) {
- continue;
- }
+ foreach ( $filteredTypes as $type ) {
$count += $group->get( $type )->getSize();
}
$this->output( "$count\n" );
--
To view, visit https://gerrit.wikimedia.org/r/233677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb3e907061c04a4dd2af23789fd59685240f0876
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
