From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 17 Nov 2015 01:32:21 +0000 (+0000)
Subject: Merge "Revert "Avoid doNotifyQueueEmpty() race conditions for Redis""
X-Git-Tag: 1.31.0-rc.0~8979
X-Git-Url: https://git.heureux-cyclage.org/index.php?a=commitdiff_plain;h=7d3fc7346da841688c1e43ab048c7030d3acad11;hp=b41781f08ea1cddf501deaff785c473b99c785fe;p=lhc%2Fweb%2Fwiklou.git

Merge "Revert "Avoid doNotifyQueueEmpty() race conditions for Redis""
---

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