From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 4 Mar 2015 05:48:38 +0000 (+0000)
Subject: Merge "Removed overzealous caching from JobQueueFederated"
X-Git-Tag: 1.31.0-rc.0~12192
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24ze_article%22%29%20.%20%22?a=commitdiff_plain;h=ea3646b476fa588a2166d792ca26a5c802545362;p=lhc%2Fweb%2Fwiklou.git

Merge "Removed overzealous caching from JobQueueFederated"
---

ea3646b476fa588a2166d792ca26a5c802545362
diff --cc includes/jobqueue/JobQueueFederated.php
index 246c06e770,40936b76a6..a0a4b7b853
--- a/includes/jobqueue/JobQueueFederated.php
+++ b/includes/jobqueue/JobQueueFederated.php
@@@ -277,12 -251,9 +251,9 @@@ class JobQueueFederated extends JobQueu
  				$queue->doBatchPush( $jobBatch, $flags | self::QOS_ATOMIC );
  			} catch ( JobQueueError $e ) {
  				$ok = false;
 -				MWExceptionHandler::logException( $e );
 +				$this->logException( $e );
  			}
- 			if ( $ok ) {
- 				$key = $this->getCacheKey( 'empty' );
- 				$this->cache->set( $key, 'false', self::CACHE_TTL_LONG );
- 			} else {
+ 			if ( !$ok ) {
  				if ( !$partitionRing->ejectFromLiveRing( $partition, 5 ) ) { // blacklist
  					throw new JobQueueError( "Could not insert job(s), no partitions available." );
  				}
@@@ -299,12 -270,9 +270,9 @@@
  				$queue->doBatchPush( $jobBatch, $flags | self::QOS_ATOMIC );
  			} catch ( JobQueueError $e ) {
  				$ok = false;
 -				MWExceptionHandler::logException( $e );
 +				$this->logException( $e );
  			}
- 			if ( $ok ) {
- 				$key = $this->getCacheKey( 'empty' );
- 				$this->cache->set( $key, 'false', self::CACHE_TTL_LONG );
- 			} else {
+ 			if ( !$ok ) {
  				if ( !$partitionRing->ejectFromLiveRing( $partition, 5 ) ) { // blacklist
  					throw new JobQueueError( "Could not insert job(s), no partitions available." );
  				}