X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fjob%2FJobQueueDB.php;h=56da4f3d8d6bb32308b955e582451841b6513d8d;hb=e7651f865d31dd6203828cf509383da2ea7515c3;hp=bab4830e14aad575bc06af94f764dbeeaab4340c;hpb=cb344a05ad0f3bf19e74bf773dd472fd9661c205;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php index bab4830e14..56da4f3d8d 100644 --- a/includes/job/JobQueueDB.php +++ b/includes/job/JobQueueDB.php @@ -225,13 +225,13 @@ class JobQueueDB extends JobQueue { $res = $dbw->select( 'job', 'job_sha1', array( // No job_type condition since it's part of the job_sha1 hash - 'job_sha1' => array_keys( $rowSet ), + 'job_sha1' => array_keys( $rowSet ), 'job_token' => '' // unclaimed ), $method ); foreach ( $res as $row ) { - wfDebug( "Job with hash '{$row->job_sha1}' is a duplicate." ); + wfDebug( "Job with hash '{$row->job_sha1}' is a duplicate.\n" ); unset( $rowSet[$row->job_sha1] ); // already enqueued } } @@ -270,6 +270,11 @@ class JobQueueDB extends JobQueue { list( $dbw, $scope ) = $this->getMasterDB(); $dbw->commit( __METHOD__, 'flush' ); // flush existing transaction + $autoTrx = $dbw->getFlag( DBO_TRX ); // get current setting + $dbw->clearFlag( DBO_TRX ); // make each query its own transaction + $scopedReset = new ScopedCallback( function() use ( $dbw, $autoTrx ) { + $dbw->setFlag( $autoTrx ? DBO_TRX : 0 ); // restore old setting + } ); $uuid = wfRandomString( 32 ); // pop attempt $job = false; // job popped off @@ -292,14 +297,15 @@ class JobQueueDB extends JobQueue { $title = Title::makeTitleSafe( $row->job_namespace, $row->job_title ); if ( !$title ) { $dbw->delete( 'job', array( 'job_id' => $row->job_id ), __METHOD__ ); - wfDebugLog( 'JobQueueDB', "Row has invalid title '{$row->job_title}'." ); + wfDebug( "Row has invalid title '{$row->job_title}'." ); continue; // try again } $job = Job::factory( $row->job_cmd, $title, self::extractBlob( $row->job_params ), $row->job_id ); + $job->metadata['id'] = $row->job_id; $job->id = $row->job_id; // XXX: work around broken subclasses break; // done - } while( true ); + } while ( true ); return $job; } @@ -331,7 +337,7 @@ class JobQueueDB extends JobQueue { $dir = $gte ? 'ASC' : 'DESC'; $row = $dbw->selectRow( 'job', '*', // find a random job array( - 'job_cmd' => $this->type, + 'job_cmd' => $this->type, 'job_token' => '', // unclaimed "job_random {$ineq} {$dbw->addQuotes( $rand )}" ), __METHOD__, @@ -348,7 +354,7 @@ class JobQueueDB extends JobQueue { // instead of job_random for reducing excess claim retries. $row = $dbw->selectRow( 'job', '*', // find a random job array( - 'job_cmd' => $this->type, + 'job_cmd' => $this->type, 'job_token' => '', // unclaimed ), __METHOD__, @@ -363,7 +369,7 @@ class JobQueueDB extends JobQueue { if ( $row ) { // claim the job $dbw->update( 'job', // update by PK array( - 'job_token' => $uuid, + 'job_token' => $uuid, 'job_token_timestamp' => $dbw->timestamp(), 'job_attempts = job_attempts+1' ), array( 'job_cmd' => $this->type, 'job_id' => $row->job_id, 'job_token' => '' ), @@ -414,7 +420,7 @@ class JobQueueDB extends JobQueue { // This uses as much of the DB wrapper functions as possible. $dbw->update( 'job', array( - 'job_token' => $uuid, + 'job_token' => $uuid, 'job_token_timestamp' => $dbw->timestamp(), 'job_attempts = job_attempts+1' ), array( 'job_id = (' . @@ -433,7 +439,7 @@ class JobQueueDB extends JobQueue { array( 'job_cmd' => $this->type, 'job_token' => $uuid ), __METHOD__ ); if ( !$row ) { // raced out by duplicate job removal - wfDebugLog( 'JobQueueDB', "Row deleted as duplicate by another process." ); + wfDebug( "Row deleted as duplicate by another process." ); } } else { break; // nothing to do @@ -450,16 +456,21 @@ class JobQueueDB extends JobQueue { * @return Job|bool */ protected function doAck( Job $job ) { - if ( !$job->getId() ) { + if ( !isset( $job->metadata['id'] ) ) { throw new MWException( "Job of type '{$job->getType()}' has no ID." ); } list( $dbw, $scope ) = $this->getMasterDB(); $dbw->commit( __METHOD__, 'flush' ); // flush existing transaction + $autoTrx = $dbw->getFlag( DBO_TRX ); // get current setting + $dbw->clearFlag( DBO_TRX ); // make each query its own transaction + $scopedReset = new ScopedCallback( function() use ( $dbw, $autoTrx ) { + $dbw->setFlag( $autoTrx ? DBO_TRX : 0 ); // restore old setting + } ); // Delete a row with a single DELETE without holding row locks over RTTs... $dbw->delete( 'job', - array( 'job_cmd' => $this->type, 'job_id' => $job->getId() ), __METHOD__ ); + array( 'job_cmd' => $this->type, 'job_id' => $job->metadata['id'] ), __METHOD__ ); return true; } @@ -498,6 +509,17 @@ class JobQueueDB extends JobQueue { return true; } + /** + * @see JobQueue::doDelete() + * @return bool + */ + protected function doDelete() { + list( $dbw, $scope ) = $this->getMasterDB(); + + $dbw->delete( 'job', array( 'job_cmd' => $this->type ) ); + return true; + } + /** * @see JobQueue::doWaitForBackups() * @return void @@ -513,7 +535,7 @@ class JobQueueDB extends JobQueue { return array( 'recycleAndDeleteStaleJobs' => array( 'callback' => array( $this, 'recycleAndDeleteStaleJobs' ), - 'period' => ceil( $this->claimTTL / 2 ) + 'period' => ceil( $this->claimTTL / 2 ) ) ); } @@ -542,6 +564,7 @@ class JobQueueDB extends JobQueue { strlen( $row->job_params ) ? unserialize( $row->job_params ) : false, $row->job_id ); + $job->metadata['id'] = $row->job_id; $job->id = $row->job_id; // XXX: work around broken subclasses return $job; } @@ -576,7 +599,11 @@ class JobQueueDB extends JobQueue { "job_attempts < {$dbw->addQuotes( $this->maxTries )}" ), // retries left __METHOD__ ); - $ids = array_map( function( $o ) { return $o->job_id; }, iterator_to_array( $res ) ); + $ids = array_map( + function( $o ) { + return $o->job_id; + }, iterator_to_array( $res ) + ); if ( count( $ids ) ) { // Reset job_token for these jobs so that other runners will pick them up. // Set the timestamp to the current time, as it is useful to now that the job @@ -608,10 +635,15 @@ class JobQueueDB extends JobQueue { // Get the IDs of jobs that are considered stale and should be removed. Selecting // the IDs first means that the UPDATE can be done by primary key (less deadlocks). $res = $dbw->select( 'job', 'job_id', $conds, __METHOD__ ); - $ids = array_map( function( $o ) { return $o->job_id; }, iterator_to_array( $res ) ); + $ids = array_map( + function( $o ) { + return $o->job_id; + }, iterator_to_array( $res ) + ); if ( count( $ids ) ) { $dbw->delete( 'job', array( 'job_id' => $ids ), __METHOD__ ); $count += $dbw->affectedRows(); + JobQueue::incrStats( 'job-abandon', $this->type, $dbw->affectedRows() ); } $dbw->unlock( "jobqueue-recycle-{$this->type}", __METHOD__ ); @@ -678,7 +710,8 @@ class JobQueueDB extends JobQueue { */ private function getCacheKey( $property ) { list( $db, $prefix ) = wfSplitWikiID( $this->wiki ); - return wfForeignMemcKey( $db, $prefix, 'jobqueue', $this->type, $property ); + $cluster = is_string( $this->cluster ) ? $this->cluster : 'main'; + return wfForeignMemcKey( $db, $prefix, 'jobqueue', $cluster, $this->type, $property ); } /**