[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Better handling of jobs execution in post-connection shutdown
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356887 )
Change subject: Better handling of jobs execution in post-connection shutdown
..
Better handling of jobs execution in post-connection shutdown
Some DeferredUpdates callables use JobQueueGroup::lazyPush but this is
never executed by the job runner, so some jobs are never added in the job
queue.
In this change a call to JobQueueGroup::pushLazyJobs is done in
JobRunner::execute.
This change is cherry-picked from the master version, but is quite
heavily lightened since an additional issue has been introduced in 1.28.
Bug: T100085
Change-Id: I721e7167eca5b0b6227234fe516005243ab22388
(cherry picked from commit d80fca05e18d9654b8458ed6966c5d3c4991d88e)
---
M includes/jobqueue/JobRunner.php
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Seb35: Looks good to me, but someone else must approve
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index a2f55b9..f82dfc4 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -268,6 +268,8 @@
DeferredUpdates::doUpdates();
$this->commitMasterChanges( $job );
+ // Push lazy jobs added by the job or its deferred
udpates
+ JobQueueGroup::pushLazyJobs();
$job->teardown();
} catch ( Exception $e ) {
MWExceptionHandler::rollbackMasterChangesAndLog( $e );
--
To view, visit https://gerrit.wikimedia.org/r/356887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I721e7167eca5b0b6227234fe516005243ab22388
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Seb35
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Seb35
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[REL1_27]: Better handling of jobs execution in post-connection shutdown
Seb35 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356887 )
Change subject: Better handling of jobs execution in post-connection shutdown
..
Better handling of jobs execution in post-connection shutdown
Some DeferredUpdates callables use JobQueueGroup::lazyPush but this is
never executed by the job runner, so some jobs are never added in the job
queue.
In this change a call to JobQueueGroup::pushLazyJobs is done in
JobRunner::execute.
This change is cherry-picked from the master version, but is quite
heavily lightened since an additional issue has been introduced in 1.28.
Bug: T100085
Change-Id: I721e7167eca5b0b6227234fe516005243ab22388
(cherry picked from commit d80fca05e18d9654b8458ed6966c5d3c4991d88e)
---
M includes/jobqueue/JobRunner.php
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/87/356887/1
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index a2f55b9..f82dfc4 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -268,6 +268,8 @@
DeferredUpdates::doUpdates();
$this->commitMasterChanges( $job );
+ // Push lazy jobs added by the job or its deferred
udpates
+ JobQueueGroup::pushLazyJobs();
$job->teardown();
} catch ( Exception $e ) {
MWExceptionHandler::rollbackMasterChangesAndLog( $e );
--
To view, visit https://gerrit.wikimedia.org/r/356887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I721e7167eca5b0b6227234fe516005243ab22388
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Seb35
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
