X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fjobqueue%2FJobQueueGroup.php;h=4853c4afffdceed93329f48d4d09503212c81e59;hb=734a969d5506a80ceabfa2bc61bda79f76d73d5f;hp=c05feb4c00446fbd5f36211920f0ff2e14288ef7;hpb=2ce2935c06723749106a0a896ad93b8e22c41185;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/jobqueue/JobQueueGroup.php b/includes/jobqueue/JobQueueGroup.php
index c05feb4c00..4853c4afff 100644
--- a/includes/jobqueue/JobQueueGroup.php
+++ b/includes/jobqueue/JobQueueGroup.php
@@ -19,6 +19,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Class to handle enqueueing of background jobs
@@ -33,19 +34,16 @@ class JobQueueGroup {
 	/** @var ProcessCacheLRU */
 	protected $cache;
 
-	/** @var string Wiki ID */
-	protected $wiki;
+	/** @var string Wiki domain ID */
+	protected $domain;
 	/** @var string|bool Read only rationale (or false if r/w) */
 	protected $readOnlyReason;
 	/** @var bool Whether the wiki is not recognized in configuration */
-	protected $invalidWiki = false;
+	protected $invalidDomain = false;
 
 	/** @var array Map of (bucket => (queue => JobQueue, types => list of types) */
 	protected $coalescedQueues;
 
-	/** @var Job[] */
-	protected $bufferedJobs = [];
-
 	const TYPE_DEFAULT = 1; // integer; jobs popped by default
 	const TYPE_ANY = 2; // integer; any job
 
@@ -56,34 +54,40 @@ class JobQueueGroup {
 	const CACHE_VERSION = 1; // integer; cache version
 
 	/**
-	 * @param string $wiki Wiki ID
+	 * @param string $domain Wiki domain ID
 	 * @param string|bool $readOnlyReason Read-only reason or false
 	 */
-	protected function __construct( $wiki, $readOnlyReason ) {
-		$this->wiki = $wiki;
+	protected function __construct( $domain, $readOnlyReason ) {
+		$this->domain = $domain;
 		$this->readOnlyReason = $readOnlyReason;
 		$this->cache = new MapCacheLRU( 10 );
 	}
 
 	/**
-	 * @param bool|string $wiki Wiki ID
+	 * @param bool|string $domain Wiki domain ID
 	 * @return JobQueueGroup
 	 */
-	public static function singleton( $wiki = false ) {
+	public static function singleton( $domain = false ) {
 		global $wgLocalDatabases;
 
-		$wiki = ( $wiki === false ) ? wfWikiID() : $wiki;
+		if ( $domain === false ) {
+			$domain = WikiMap::getCurrentWikiDomain()->getId();
+		}
 
-		if ( !isset( self::$instances[$wiki] ) ) {
-			self::$instances[$wiki] = new self( $wiki, wfConfiguredReadOnlyReason() );
+		if ( !isset( self::$instances[$domain] ) ) {
+			self::$instances[$domain] = new self( $domain, wfConfiguredReadOnlyReason() );
 			// Make sure jobs are not getting pushed to bogus wikis. This can confuse
 			// the job runner system into spawning endless RPC requests that fail (T171371).
-			if ( $wiki !== wfWikiID() && !in_array( $wiki, $wgLocalDatabases ) ) {
-				self::$instances[$wiki]->invalidWiki = true;
+			$wikiId = WikiMap::getWikiIdFromDomain( $domain );
+			if (
+				!WikiMap::isCurrentWikiDomain( $domain ) &&
+				!in_array( $wikiId, $wgLocalDatabases )
+			) {
+				self::$instances[$domain]->invalidDomain = true;
 			}
 		}
 
-		return self::$instances[$wiki];
+		return self::$instances[$domain];
 	}
 
 	/**
@@ -104,8 +108,12 @@ class JobQueueGroup {
 	public function get( $type ) {
 		global $wgJobTypeConf;
 
-		$conf = [ 'wiki' => $this->wiki, 'type' => $type ];
-		$conf += $wgJobTypeConf[$type] ?? $wgJobTypeConf['default'];
+		$conf = [ 'domain' => $this->domain, 'type' => $type ];
+		if ( isset( $wgJobTypeConf[$type] ) ) {
+			$conf = $conf + $wgJobTypeConf[$type];
+		} else {
+			$conf = $conf + $wgJobTypeConf['default'];
+		}
 		$conf['aggregator'] = JobQueueAggregator::singleton();
 		if ( !isset( $conf['readOnlyReason'] ) ) {
 			$conf['readOnlyReason'] = $this->readOnlyReason;
@@ -127,15 +135,15 @@ class JobQueueGroup {
 	public function push( $jobs ) {
 		global $wgJobTypesExcludedFromDefaultQueue;
 
-		if ( $this->invalidWiki ) {
+		if ( $this->invalidDomain ) {
 			// Do not enqueue job that cannot be run (T171371)
-			$e = new LogicException( "Domain '{$this->wiki}' is not recognized." );
+			$e = new LogicException( "Domain '{$this->domain}' is not recognized." );
 			MWExceptionHandler::logException( $e );
 			return;
 		}
 
 		$jobs = is_array( $jobs ) ? $jobs : [ $jobs ];
-		if ( !count( $jobs ) ) {
+		if ( $jobs === [] ) {
 			return;
 		}
 
@@ -159,13 +167,13 @@ class JobQueueGroup {
 
 		$cache = ObjectCache::getLocalClusterInstance();
 		$cache->set(
-			$cache->makeGlobalKey( 'jobqueue', $this->wiki, 'hasjobs', self::TYPE_ANY ),
+			$cache->makeGlobalKey( 'jobqueue', $this->domain, 'hasjobs', self::TYPE_ANY ),
 			'true',
 			15
 		);
 		if ( array_diff( array_keys( $jobsByType ), $wgJobTypesExcludedFromDefaultQueue ) ) {
 			$cache->set(
-				$cache->makeGlobalKey( 'jobqueue', $this->wiki, 'hasjobs', self::TYPE_DEFAULT ),
+				$cache->makeGlobalKey( 'jobqueue', $this->domain, 'hasjobs', self::TYPE_DEFAULT ),
 				'true',
 				15
 			);
@@ -184,9 +192,9 @@ class JobQueueGroup {
 	 * @since 1.26
 	 */
 	public function lazyPush( $jobs ) {
-		if ( $this->invalidWiki ) {
+		if ( $this->invalidDomain ) {
 			// Do not enqueue job that cannot be run (T171371)
-			throw new LogicException( "Domain '{$this->wiki}' is not recognized." );
+			throw new LogicException( "Domain '{$this->domain}' is not recognized." );
 		}
 
 		if ( PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg' ) {
@@ -199,7 +207,7 @@ class JobQueueGroup {
 		// Throw errors now instead of on push(), when other jobs may be buffered
 		$this->assertValidJobs( $jobs );
 
-		$this->bufferedJobs = array_merge( $this->bufferedJobs, $jobs );
+		DeferredUpdates::addUpdate( new JobQueueEnqueueUpdate( $this->domain, $jobs ) );
 	}
 
 	/**
@@ -207,17 +215,10 @@ class JobQueueGroup {
 	 *
 	 * @return void
 	 * @since 1.26
+	 * @deprecated Since 1.33 Not needed anymore
 	 */
 	public static function pushLazyJobs() {
-		foreach ( self::$instances as $group ) {
-			try {
-				$group->push( $group->bufferedJobs );
-				$group->bufferedJobs = [];
-			} catch ( Exception $e ) {
-				// Get in as many jobs as possible and let other post-send updates happen
-				MWExceptionHandler::logException( $e );
-			}
-		}
+		wfDeprecated( __METHOD__, '1.33' );
 	}
 
 	/**
@@ -334,7 +335,7 @@ class JobQueueGroup {
 	 */
 	public function queuesHaveJobs( $type = self::TYPE_ANY ) {
 		$cache = ObjectCache::getLocalClusterInstance();
-		$key = $cache->makeGlobalKey( 'jobqueue', $this->wiki, 'hasjobs', $type );
+		$key = $cache->makeGlobalKey( 'jobqueue', $this->domain, 'hasjobs', $type );
 
 		$value = $cache->get( $key );
 		if ( $value === false ) {
@@ -403,7 +404,7 @@ class JobQueueGroup {
 			$this->coalescedQueues = [];
 			foreach ( $wgJobTypeConf as $type => $conf ) {
 				$queue = JobQueue::factory(
-					[ 'wiki' => $this->wiki, 'type' => 'null' ] + $conf );
+					[ 'wiki' => $this->domain, 'type' => 'null' ] + $conf );
 				$loc = $queue->getCoalesceLocationInternal();
 				if ( !isset( $this->coalescedQueues[$loc] ) ) {
 					$this->coalescedQueues[$loc]['queue'] = $queue;
@@ -429,17 +430,17 @@ class JobQueueGroup {
 	 */
 	private function getCachedConfigVar( $name ) {
 		// @TODO: cleanup this whole method with a proper config system
-		if ( $this->wiki === wfWikiID() ) {
+		if ( WikiMap::isCurrentWikiDomain( $this->domain ) ) {
 			return $GLOBALS[$name]; // common case
 		} else {
-			$wiki = $this->wiki;
-			$cache = ObjectCache::getMainWANInstance();
+			$wiki = WikiMap::getWikiIdFromDomain( $this->domain );
+			$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 			$value = $cache->getWithSetCallback(
-				$cache->makeGlobalKey( 'jobqueue', 'configvalue', $wiki, $name ),
+				$cache->makeGlobalKey( 'jobqueue', 'configvalue', $this->domain, $name ),
 				$cache::TTL_DAY + mt_rand( 0, $cache::TTL_DAY ),
 				function () use ( $wiki, $name ) {
 					global $wgConf;
-
+					// @TODO: use the full domain ID here
 					return [ 'v' => $wgConf->getConfig( $wiki, $name ) ];
 				},
 				[ 'pcTTL' => WANObjectCache::TTL_PROC_LONG ]
@@ -460,12 +461,4 @@ class JobQueueGroup {
 			}
 		}
 	}
-
-	function __destruct() {
-		$n = count( $this->bufferedJobs );
-		if ( $n > 0 ) {
-			$type = implode( ', ', array_unique( array_map( 'get_class', $this->bufferedJobs ) ) );
-			trigger_error( __METHOD__ . ": $n buffered job(s) of type(s) $type never inserted." );
-		}
-	}
 }