jenkins-bot has submitted this change and it was merged.
Change subject: Include cluster name in JobQueueDB cache keys.
......................................................................
Include cluster name in JobQueueDB cache keys.
* This makes it work properly with JobQueueFederated.
Change-Id: I0309dee7e97fa3813dfa5f1ae1eb1fcbca14b829
---
M includes/job/JobQueueDB.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index e8e0385..27e927c 100644
--- a/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@ -689,7 +689,8 @@
*/
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 );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/60225
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0309dee7e97fa3813dfa5f1ae1eb1fcbca14b829
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
