From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 7 Jul 2017 01:23:04 +0000 (+0000)
Subject: Merge "Push all DeferredUpdates to POSTSEND queue when running that queue"
X-Git-Tag: 1.31.0-rc.0~2775
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=6baf2fb802f20af063cb4fe13cd99c9248aae1cb;hp=43697f81b00f29cbe9351ea527ec499149076ddb

Merge "Push all DeferredUpdates to POSTSEND queue when running that queue"
---

diff --git a/includes/deferred/DeferredUpdates.php b/includes/deferred/DeferredUpdates.php
index a3a37f6f2e..e8f27ef233 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -76,9 +76,12 @@ class DeferredUpdates {
 	public static function addUpdate( DeferrableUpdate $update, $stage = self::POSTSEND ) {
 		global $wgCommandLineMode;
 
-		// This is a sub-DeferredUpdate, run it right after its parent update
 		if ( self::$executeContext && self::$executeContext['stage'] >= $stage ) {
+			// This is a sub-DeferredUpdate; run it right after its parent update.
+			// Also, while post-send updates are running, push any "pre-send" jobs to the
+			// active post-send queue to make sure they get run this round (or at all).
 			self::$executeContext['subqueue'][] = $update;
+
 			return;
 		}
 
@@ -183,16 +186,6 @@ class DeferredUpdates {
 		while ( $updates ) {
 			$queue = []; // clear the queue
 
-			if ( $mode === 'enqueue' ) {
-				try {
-					// Push enqueuable updates to the job queue and get the rest
-					$updates = self::enqueueUpdates( $updates );
-				} catch ( Exception $e ) {
-					// Let other updates have a chance to run if this failed
-					MWExceptionHandler::rollbackMasterChangesAndLog( $e );
-				}
-			}
-
 			// Order will be DataUpdate followed by generic DeferrableUpdate tasks
 			$updatesByType = [ 'data' => [], 'generic' => [] ];
 			foreach ( $updates as $du ) {
@@ -212,13 +205,9 @@ class DeferredUpdates {
 			// Execute all remaining tasks...
 			foreach ( $updatesByType as $updatesForType ) {
 				foreach ( $updatesForType as $update ) {
-					self::$executeContext = [
-						'update' => $update,
-						'stage' => $stage,
-						'subqueue' => []
-					];
+					self::$executeContext = [ 'stage' => $stage, 'subqueue' => [] ];
 					/** @var DeferrableUpdate $update */
-					$guiError = self::runUpdate( $update, $lbFactory, $stage );
+					$guiError = self::runUpdate( $update, $lbFactory, $mode, $stage );
 					$reportableError = $reportableError ?: $guiError;
 					// Do the subqueue updates for $update until there are none
 					while ( self::$executeContext['subqueue'] ) {
@@ -230,7 +219,7 @@ class DeferredUpdates {
 							$subUpdate->setTransactionTicket( $ticket );
 						}
 
-						$guiError = self::runUpdate( $subUpdate, $lbFactory, $stage );
+						$guiError = self::runUpdate( $subUpdate, $lbFactory, $mode, $stage );
 						$reportableError = $reportableError ?: $guiError;
 					}
 					self::$executeContext = null;
@@ -248,16 +237,26 @@ class DeferredUpdates {
 	/**
 	 * @param DeferrableUpdate $update
 	 * @param LBFactory $lbFactory
+	 * @param string $mode
 	 * @param integer $stage
 	 * @return ErrorPageError|null
 	 */
-	private static function runUpdate( DeferrableUpdate $update, LBFactory $lbFactory, $stage ) {
+	private static function runUpdate(
+		DeferrableUpdate $update, LBFactory $lbFactory, $mode, $stage
+	) {
 		$guiError = null;
 		try {
-			$fnameTrxOwner = get_class( $update ) . '::doUpdate';
-			$lbFactory->beginMasterChanges( $fnameTrxOwner );
-			$update->doUpdate();
-			$lbFactory->commitMasterChanges( $fnameTrxOwner );
+			if ( $mode === 'enqueue' && $update instanceof EnqueueableDataUpdate ) {
+				// Run only the job enqueue logic to complete the update later
+				$spec = $update->getAsJobSpecification();
+				JobQueueGroup::singleton( $spec['wiki'] )->push( $spec['job'] );
+			} else {
+				// Run the bulk of the update now
+				$fnameTrxOwner = get_class( $update ) . '::doUpdate';
+				$lbFactory->beginMasterChanges( $fnameTrxOwner );
+				$update->doUpdate();
+				$lbFactory->commitMasterChanges( $fnameTrxOwner );
+			}
 		} catch ( Exception $e ) {
 			// Reporting GUI exceptions does not work post-send
 			if ( $e instanceof ErrorPageError && $stage === self::PRESEND ) {
diff --git a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
index 2c199bc12a..3b423563ca 100644
--- a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
+++ b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
@@ -192,4 +192,30 @@ class DeferredUpdatesTest extends MediaWikiTestCase {
 
 		DeferredUpdates::doUpdates();
 	}
+
+	public function testPresendAddOnPostsendRun() {
+		$this->setMwGlobals( 'wgCommandLineMode', true );
+
+		$x = false;
+		$y = false;
+		wfGetLBFactory()->commitMasterChanges( __METHOD__ ); // clear anything
+
+		DeferredUpdates::addCallableUpdate(
+			function () use ( &$x, &$y ) {
+				$x = true;
+				DeferredUpdates::addCallableUpdate(
+					function () use ( &$y ) {
+						$y = true;
+					},
+					DeferredUpdates::PRESEND
+				);
+			},
+			DeferredUpdates::POSTSEND
+		);
+
+		DeferredUpdates::doUpdates();
+
+		$this->assertTrue( $x, "Outer POSTSEND update ran" );
+		$this->assertTrue( $y, "Nested PRESEND update ran" );
+	}
 }