jenkins-bot has submitted this change and it was merged.
Change subject: Added wiki ID to getCoalesceLocationInternal()
......................................................................
Added wiki ID to getCoalesceLocationInternal()
Change-Id: Ia1ab1883808b669e3c3b442d860c1c562e984564
---
M includes/job/JobQueueDB.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/job/JobQueueDB.php b/includes/job/JobQueueDB.php
index 2052fc1..af21bc1 100644
--- a/includes/job/JobQueueDB.php
+++ b/includes/job/JobQueueDB.php
@@ -605,7 +605,9 @@
}
public function getCoalesceLocationInternal() {
- return $this->cluster ? "DBCluster:{$this->cluster}" :
"LBFactory:{$this->wiki}";
+ return $this->cluster
+ ? "DBCluster:{$this->cluster}:{$this->wiki}"
+ : "LBFactory:{$this->wiki}";
}
protected function doGetSiblingQueuesWithJobs( array $types ) {
--
To view, visit https://gerrit.wikimedia.org/r/87451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1ab1883808b669e3c3b442d860c1c562e984564
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
