jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332915 )
Change subject: Add small script for common job queue admin tasks
......................................................................
Add small script for common job queue admin tasks
This can handle dropping queued and re-enqueueing abandoned jobs.
Also use the DB cache table to avoid re-enqueuing duplicate jobs
if this has to get used several times for a queue during a week.
Change-Id: Ib56cf57e56f03ce6f1c4b52e3e36f228413c1056
---
M autoload.php
A maintenance/manageJobs.php
2 files changed, 99 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index 5d0ca0d..7ed08df 100644
--- a/autoload.php
+++ b/autoload.php
@@ -810,6 +810,7 @@
'MaintenanceFormatInstallDoc' => __DIR__ .
'/maintenance/formatInstallDoc.php',
'MakeTestEdits' => __DIR__ . '/maintenance/makeTestEdits.php',
'MalformedTitleException' => __DIR__ .
'/includes/title/MalformedTitleException.php',
+ 'ManageJobs' => __DIR__ . '/maintenance/manageJobs.php',
'ManualLogEntry' => __DIR__ . '/includes/logging/LogEntry.php',
'MapCacheLRU' => __DIR__ . '/includes/libs/MapCacheLRU.php',
'MappedIterator' => __DIR__ . '/includes/libs/MappedIterator.php',
diff --git a/maintenance/manageJobs.php b/maintenance/manageJobs.php
new file mode 100644
index 0000000..9585ed8
--- /dev/null
+++ b/maintenance/manageJobs.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Maintenance script that handles managing job queue admin tasks
+ *
+ * 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
+ * @author Aaron Schulz
+ */
+
+require_once __DIR__ . '/Maintenance.php';
+
+/**
+ * Maintenance script that handles managing job queue admin tasks (re-push,
delete, ...)
+ *
+ * @ingroup Maintenance
+ */
+class ManageJobs extends Maintenance {
+ public function __construct() {
+ parent::__construct();
+ $this->addDescription( 'Perform administrative tasks on a job
queue' );
+ $this->addOption( 'type', 'Job type', true, true );
+ $this->addOption( 'action', 'Queue operation ("delete",
"repush-abandoned")', true, true );
+ }
+
+ public function execute() {
+ $type = $this->getOption( 'type' );
+ $action = $this->getOption( 'action' );
+
+ $group = JobQueueGroup::singleton();
+ $queue = $group->get( $type );
+
+ if ( $action === 'delete' ) {
+ $this->delete( $queue );
+ } elseif ( $action === 'repush-abandoned' ) {
+ $this->repushAbandoned( $queue );
+ } else {
+ $this->error( "Invalid action '$action'.", 1 );
+ }
+ }
+
+ private function delete( JobQueue $queue ) {
+ $this->output( "Queue has {$queue->getSize()} job(s);
deleting...\n" );
+ $queue->delete();
+ $this->output( "Done; current size is {$queue->getSize()}
job(s).\n" );
+ }
+
+ private function repushAbandoned( JobQueue $queue ) {
+ $cache = ObjectCache::getInstance( CACHE_DB );
+ $key = $cache->makeGlobalKey( 'last-job-repush',
$queue->getWiki(), $queue->getType() );
+
+ $now = wfTimestampNow();
+ $lastRepushTime = $cache->get( $key );
+ if ( $lastRepushTime === false ) {
+ $lastRepushTime = wfTimestamp( TS_MW, 1 ); // include
all jobs
+ }
+
+ $this->output( "Last re-push time: $lastRepushTime; current
time: $now\n" );
+
+ $count = 0;
+ $skipped = 0;
+ foreach ( $queue->getAllAbandonedJobs() as $job ) {
+ /** @var Job $job */
+ if ( $job->getQueuedTimestamp() < $lastRepushTime ) {
+ ++$skipped;
+ continue; // already re-pushed in prior round
+ }
+
+ $queue->push( $job );
+ ++$count;
+
+ if ( ( $count % $this->mBatchSize ) == 0 ) {
+ $queue->waitForBackups();
+ }
+ }
+
+ $cache->set( $key, $now ); // next run will ignore these jobs
+
+ $this->output( "Re-pushed $count job(s) [$skipped skipped].\n"
);
+ }
+}
+
+$maintClass = "ManageJobs";
+require_once RUN_MAINTENANCE_IF_MAIN;
--
To view, visit https://gerrit.wikimedia.org/r/332915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib56cf57e56f03ce6f1c4b52e3e36f228413c1056
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
