From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 10 Nov 2015 23:21:19 +0000 (+0000)
Subject: Merge "Validates wgArticlePath does start with slash (/)."
X-Git-Tag: 1.31.0-rc.0~9024
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f87979cf08f7c07d2ac77b7999d2380849dd9fc2;hp=a4a3d0454069c25a24e2bfe732a665cc6a865878;p=lhc%2Fweb%2Fwiklou.git

Merge "Validates wgArticlePath does start with slash (/)."
---

diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
index 6c49646b3b..f8a004040b 100644
--- a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
+++ b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
@@ -59,7 +59,11 @@ class JobQueueAggregatorRedis extends JobQueueAggregator {
 			return false;
 		}
 		try {
-			$conn->hDel( $this->getReadyQueueKey(), $this->encQueueName( $type, $wiki ) );
+			// Make sure doNotifyQueueNonEmpty() takes precedence to avoid races
+			$conn->watch( $this->getReadyQueueKey() );
+			$conn->multi()
+				->hDel( $this->getReadyQueueKey(), $this->encQueueName( $type, $wiki ) )
+				->exec();
 
 			return true;
 		} catch ( RedisException $e ) {