From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 4 Jun 2015 23:53:56 +0000 (-0700)
Subject: Make sure job queue partitions use the null aggregator
X-Git-Tag: 1.31.0-rc.0~11164^2
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=de58577c2de96bd468a19e1b4d1abf1fcea151c0;p=lhc%2Fweb%2Fwiklou.git

Make sure job queue partitions use the null aggregator

* Fixes problem from 37042262e32e
* The main class already handles the calls.
* Partitions call notifyQueueNonEmpty() on pop() even
  when the other partitions have jobs, so it is also wrong
  in addition to redundant.

Bug: T101427
Change-Id: Ic3235e1f2038053fabf92f97c663479a21d75317
---

diff --git a/includes/jobqueue/JobQueueFederated.php b/includes/jobqueue/JobQueueFederated.php
index ecbb0317ae..109ca01992 100644
--- a/includes/jobqueue/JobQueueFederated.php
+++ b/includes/jobqueue/JobQueueFederated.php
@@ -93,6 +93,8 @@ class JobQueueFederated extends JobQueue {
 		) {
 			unset( $baseConfig[$o] ); // partition queue doesn't care about this
 		}
+		// The class handles all aggregator calls already
+		unset( $baseConfig['aggregator'] );
 		// Get the partition queue objects
 		foreach ( $partitionMap as $partition => $w ) {
 			if ( !isset( $params['configByPartition'][$partition] ) ) {