Merge "Added wiki ID to getCoalesceLocationInternal()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 3 Oct 2013 23:59:13 +0000 (23:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 3 Oct 2013 23:59:13 +0000 (23:59 +0000)
includes/job/JobQueueDB.php

index 2052fc1..af21bc1 100644 (file)
@@ -605,7 +605,9 @@ class JobQueueDB extends JobQueue {
        }
 
        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 ) {