Include cluster name in JobQueueDB cache keys.

* This makes it work properly with JobQueueFederated.

Change-Id: I0309dee7e97fa3813dfa5f1ae1eb1fcbca14b829

diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index e8e0385..27e927c 100644 (file)
--- 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 );
        }
 
        /**