jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Avoid doNotifyQueueEmpty() race conditions for Redis"
......................................................................
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
---
M includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
1 file changed, 1 insertion(+), 5 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
index f8a0040..6c49646 100644
--- a/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
+++ b/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php
@@ -59,11 +59,7 @@
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 ) {
--
To view, visit https://gerrit.wikimedia.org/r/252587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45b009e8768b79368898762bfedbca4dc0a79943
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
