X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fjobqueue%2Fjobs%2FRefreshLinksJob.php;h=9f3550f269b3987d8b7f0b70a0bab6eef1fa1f2d;hp=64d955ae96088b2ffeabc38361a7e69dcf393f85;hb=1d7a1bf8bddf0908e4f572c82268733f63126a13;hpb=d83306610dd468077e58dcb20a9049dd4301c1b3

diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php
index 64d955ae96..9f3550f269 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -39,9 +39,9 @@ use Wikimedia\Rdbms\DBReplicationWaitError;
 class RefreshLinksJob extends Job {
 	/** @var float Cache parser output when it takes this long to render */
 	const PARSE_THRESHOLD_SEC = 1.0;
-	/** @var integer Lag safety margin when comparing root job times to last-refresh times */
+	/** @var int Lag safety margin when comparing root job times to last-refresh times */
 	const CLOCK_FUDGE = 10;
-	/** @var integer How many seconds to wait for replica DBs to catch up */
+	/** @var int How many seconds to wait for replica DBs to catch up */
 	const LAG_WAIT_TIMEOUT = 15;
 
 	function __construct( Title $title, array $params ) {
@@ -87,7 +87,7 @@ class RefreshLinksJob extends Job {
 			// When the base job branches, wait for the replica DBs to catch up to the master.
 			// From then on, we know that any template changes at the time the base job was
 			// enqueued will be reflected in backlink page parses when the leaf jobs run.
-			if ( !isset( $params['range'] ) ) {
+			if ( !isset( $this->params['range'] ) ) {
 				try {
 					$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
 					$lbFactory->waitForReplication( [
@@ -113,7 +113,7 @@ class RefreshLinksJob extends Job {
 			JobQueueGroup::singleton()->push( $jobs );
 		// Job to update link tables for a set of titles
 		} elseif ( isset( $this->params['pages'] ) ) {
-			foreach ( $this->params['pages'] as $pageId => $nsAndKey ) {
+			foreach ( $this->params['pages'] as $nsAndKey ) {
 				list( $ns, $dbKey ) = $nsAndKey;
 				$this->runForTitle( Title::makeTitleSafe( $ns, $dbKey ) );
 			}
@@ -253,7 +253,7 @@ class RefreshLinksJob extends Job {
 		// This avoids snapshot-clearing errors in LinksUpdate::acquirePageLock().
 		$lbFactory->commitAndWaitForReplication( __METHOD__, $ticket );
 
-		foreach ( $updates as $key => $update ) {
+		foreach ( $updates as $update ) {
 			// FIXME: This code probably shouldn't be here?
 			// Needed by things like Echo notifications which need
 			// to know which user caused the links update
@@ -279,6 +279,10 @@ class RefreshLinksJob extends Job {
 
 		InfoAction::invalidateCache( $title );
 
+		// Commit any writes here in case this method is called in a loop.
+		// In that case, the scoped lock will fail to be acquired.
+		$lbFactory->commitAndWaitForReplication( __METHOD__, $ticket );
+
 		return true;
 	}
 
@@ -297,6 +301,12 @@ class RefreshLinksJob extends Job {
 	}
 
 	public function workItemCount() {
-		return isset( $this->params['pages'] ) ? count( $this->params['pages'] ) : 1;
+		if ( !empty( $this->params['recursive'] ) ) {
+			return 0; // nothing actually refreshed
+		} elseif ( isset( $this->params['pages'] ) ) {
+			return count( $this->params['pages'] );
+		}
+
+		return 1; // one title
 	}
 }