From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 1 Sep 2016 17:03:31 +0000 (-0700)
Subject: Move run-on-add logic in DeferredUpdates to addUpdate()
X-Git-Tag: 1.31.0-rc.0~5795
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=ce504f2d19b7450c75f0a332089a720e2ea402ce;p=lhc%2Fweb%2Fwiklou.git

Move run-on-add logic in DeferredUpdates to addUpdate()

Change-Id: I1b3ec21e07549f7250fa497f352fe1c131ddc88a
---

diff --git a/includes/deferred/DeferredUpdates.php b/includes/deferred/DeferredUpdates.php
index 48f1e8ef26..5918770d5f 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -50,17 +50,27 @@ class DeferredUpdates {
 	const BIG_QUEUE_SIZE = 100;
 
 	/**
-	 * Add an update to the deferred list
+	 * Add an update to the deferred list to be run later by execute()
+	 *
+	 * In CLI mode, callback magic will also be used to run updates when safe
 	 *
 	 * @param DeferrableUpdate $update Some object that implements doUpdate()
 	 * @param integer $type DeferredUpdates constant (PRESEND or POSTSEND) (since 1.27)
 	 */
 	public static function addUpdate( DeferrableUpdate $update, $type = self::POSTSEND ) {
+		global $wgCommandLineMode;
+
 		if ( $type === self::PRESEND ) {
 			self::push( self::$preSendUpdates, $update );
 		} else {
 			self::push( self::$postSendUpdates, $update );
 		}
+
+		// Try to run the updates now if in CLI mode and no transaction is active.
+		// This covers scripts that don't/barely use the DB but make updates to other stores.
+		if ( $wgCommandLineMode ) {
+			self::tryOpportunisticExecute( 'run' );
+		}
 	}
 
 	/**
@@ -96,8 +106,6 @@ class DeferredUpdates {
 	}
 
 	private static function push( array &$queue, DeferrableUpdate $update ) {
-		global $wgCommandLineMode;
-
 		if ( $update instanceof MergeableUpdate ) {
 			$class = get_class( $update ); // fully-qualified class
 			if ( isset( $queue[$class] ) ) {
@@ -110,25 +118,6 @@ class DeferredUpdates {
 		} else {
 			$queue[] = $update;
 		}
-
-		// CLI scripts may forget to periodically flush these updates,
-		// so try to handle that rather than OOMing and losing them entirely.
-		// Try to run the updates as soon as there is no current wiki transaction.
-		static $waitingOnTrx = false; // de-duplicate callback
-		if ( $wgCommandLineMode && !$waitingOnTrx ) {
-			$lb = wfGetLB();
-			$dbw = $lb->getAnyOpenConnection( $lb->getWriterIndex() );
-			// Do the update as soon as there is no transaction
-			if ( $dbw && $dbw->trxLevel() ) {
-				$waitingOnTrx = true;
-				$dbw->onTransactionIdle( function() use ( &$waitingOnTrx ) {
-					DeferredUpdates::doUpdates();
-					$waitingOnTrx = false;
-				} );
-			} else {
-				self::doUpdates();
-			}
-		}
 	}
 
 	public static function execute( array &$queue, $mode ) {