jenkins-bot has submitted this change and it was merged.

Change subject: Always fork Cirrus LinksUpdate behavior
......................................................................


Always fork Cirrus LinksUpdate behavior

Cirrus used to try to be fancy and only fork the links update behavior
when running in a web process.  This was cool but ran into trouble when
the standard links update behavior ran long causing the Cirrus behavior
to run even longer and get cut off by the maximum amount of time that
jobs are allowed to run.

This should give the Cirrus behavior the maximum possible time.  If it
still gets cut off then we have some trouble with Cirrus.

Bug: 56783
Change-Id: I1df947293a2807dcfe141d98aae73a9a016d100e
---
M includes/CirrusSearchUpdater.php
1 file changed, 1 insertion(+), 8 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/CirrusSearchUpdater.php b/includes/CirrusSearchUpdater.php
index ef4d18d..1712180 100644
--- a/includes/CirrusSearchUpdater.php
+++ b/includes/CirrusSearchUpdater.php
@@ -111,14 +111,7 @@
                        'removedLinks' => $removedLinks,
                        'titleNeedsUpdate' => $titleNeedsUpdate,
                ) );
-               if ( $inCli ) {
-                       // We are already on the cli (probably already running 
jobs) then there is no reason
-                       // to fork this job from the hook - just run them right 
now.
-                       $job->run();
-               } else {
-                       // We're in a web process so we should push this job on 
the queue and get to it later.
-                       JobQueueGroup::singleton()->push( $job );
-               }
+               JobQueueGroup::singleton()->push( $job );
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/95086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1df947293a2807dcfe141d98aae73a9a016d100e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to