EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326010 )
Change subject: Don't count abandoned jobs as job queue pressure
......................................................................
Don't count abandoned jobs as job queue pressure
It looks like the reason these jobs arn't processing is because
abandoned jobs are being considered as part of the acquired jobs
count, so if a job gets abandoned it keeps taking up a slot in
our job pressure calculation. These shouldn't count as pressure
because they are not running anymore.
Change-Id: I44fbce2b7dc47345ab0e3745d1653f418d75943d
---
M maintenance/initImageData.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages
refs/changes/10/326010/1
diff --git a/maintenance/initImageData.php b/maintenance/initImageData.php
index 6574d93..53ce1fc 100644
--- a/maintenance/initImageData.php
+++ b/maintenance/initImageData.php
@@ -95,11 +95,13 @@
sleep( 1 );
$queued = $group->getSize();
$running = $group->getAcquiredCount();
+ $abandoned = $group->getAbandonedCount();
+
if ( !$isQuiet && ++$i % 10 === 0 ) {
$now = date( 'Y-m-d H:i:s T');
- $this->output( "[$now] Queued: $queued Running:
$running Max: $maxPressure\n" );
+ $this->output( "[$now] Queued: $queued Running:
$running Abandoned: $abandoned Max: $maxPressure\n" );
}
- } while ( $queued + $running >= $maxPressure );
+ } while ( $queued + $running - $abandoned >= $maxPressure );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/326010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44fbce2b7dc47345ab0e3745d1653f418d75943d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
