Merge "Add default for revision.rev_text_id where missing"

[lhc/web/wiklou.git] / includes / jobqueue / JobQueueFederated.php

diff --git a/includes/jobqueue/JobQueueFederated.php b/includes/jobqueue/JobQueueFederated.php
index 44721d9..7f3b2b1 100644 (file)
--- a/includes/jobqueue/JobQueueFederated.php
+++ b/includes/jobqueue/JobQueueFederated.php
@@ -184,11 +184,10 @@ class JobQueueFederated extends JobQueue {
                // Try to insert the jobs and update $partitionsTry on any failures.
                // Retry to insert any remaning jobs again, ignoring the bad partitions.
                $jobsLeft = $jobs;
-               // @codingStandardsIgnoreStart Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
+               // phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
                for ( $i = $this->maxPartitionsTry; $i > 0 && count( $jobsLeft ); --$i ) {
-                       // @codingStandardsIgnoreEnd
                        try {
-                               $partitionRing->getLiveRing();
+                               $partitionRing->getLiveLocationWeights();
                        } catch ( UnexpectedValueException $e ) {
                                break; // all servers down; nothing to insert to
                        }
@@ -202,7 +201,7 @@ class JobQueueFederated extends JobQueue {
 
        /**
         * @param array $jobs
-        * @param HashRing $partitionRing
+        * @param HashRing &$partitionRing
         * @param int $flags
         * @throws JobQueueError
         * @return array List of Job object that could not be inserted