Revert "Avoid doNotifyQueueEmpty() race conditions for Redis"

This might hitting a phpredis bug causing "read error" messages.

This reverts commit ab2e1dae28f3b15e100e814544419f6719ef06f5.

Bug: T118430
Change-Id: I45b009e8768b79368898762bfedbca4dc0a79943

diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
index f8a0040..6c49646 100644 (file)
--- a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
+++ b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
@@ -59,11 +59,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 ) {