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

diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
index 250947a..9b4e7e9 100644 (file)
--- 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 ) {