From 68473dd5fb56099456c405e2a23b98b4a7c5cffb Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 21 Apr 2013 14:56:20 -0700 Subject: [PATCH] Include cluster name in JobQueueDB cache keys. * This makes it work properly with JobQueueFederated. Change-Id: I0309dee7e97fa3813dfa5f1ae1eb1fcbca14b829 --- includes/job/JobQueueDB.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php index e8e03852af..27e927c52a 100644 --- a/includes/job/JobQueueDB.php +++ b/includes/job/JobQueueDB.php @@ -689,7 +689,8 @@ class JobQueueDB extends JobQueue { */ private function getCacheKey( $property ) { list( $db, $prefix ) = wfSplitWikiID( $this->wiki ); - return wfForeignMemcKey( $db, $prefix, 'jobqueue', $this->type, $property ); + $cluster = is_string( $this->cluster ) ? $this->cluster : 'main'; + return wfForeignMemcKey( $db, $prefix, 'jobqueue', $cluster, $this->type, $property ); } /** -- 2.20.1