From d8666c0e222321000f88079c511e7224d1f7e239 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 11 Nov 2015 22:20:37 +0000
Subject: [PATCH] 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
---
 includes/jobqueue/aggregator/JobQueueAggregatorRedis.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
index f8a004040b..6c49646b3b 100644
--- 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 ) {
-- 
2.20.1