Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deferred: Remove unused $mode of internal tryOpportunisticExecute

Browse source 
Has not been used for a while.

Change-Id: I0089fa01524924a092a616ebfa190a360ff957b3
This commit is contained in:
Timo Tijhof 2022-06-17 18:38:19 +01:00
parent 697106c988
commit e802062e11
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/db/MWLBFactory.php
View file

@ -405,7 +405,7 @@ abstract class MWLBFactory {
$lbFactory->setWaitForReplicationListener(
__METHOD__,
static function () use ( $stats, $config ) {
DeferredUpdates::tryOpportunisticExecute( 'run' );
DeferredUpdates::tryOpportunisticExecute();
// Flush stats periodically in long-running CLI scripts to avoid OOM (T181385)
MediaWiki::emitBufferedStatsdData( $stats, $config );
}
@ -416,7 +416,7 @@ abstract class MWLBFactory {
__METHOD__,
static function ( $trigger ) use ( $stats, $config ) {
if ( $trigger === IDatabase::TRIGGER_COMMIT ) {
DeferredUpdates::tryOpportunisticExecute( 'run' );
DeferredUpdates::tryOpportunisticExecute();
}
// Flush stats periodically in long-running CLI scripts to avoid OOM (T181385)
MediaWiki::emitBufferedStatsdData( $stats, $config );

13
includes/deferred/DeferredUpdates.php
View file

@ -132,7 +132,7 @@ class DeferredUpdates {
// excessive pending update queue sizes when long-running scripts never trigger the
// basic RDBMs hooks for running pending updates.
if ( $commandLineMode ) {
self::tryOpportunisticExecute( 'run' );
self::tryOpportunisticExecute();
}
}
@ -274,19 +274,14 @@ class DeferredUpdates {
* there are still busy DB handles, then EnqueueableDataUpdate updates might be enqueued
* as jobs. This avoids excessive memory use and risk of losing updates due to failures.
*
* The $mode parameter determines how the updates are processed. Use "run" to process the
* updates by running them. Otherwise, use "enqueue" to process the updates by converting
* the EnqueueableDataUpdate instances to jobs and running the others.
*
* Note that this method operates on updates from all stages and thus should not be called
* during web requests. It is only intended for long-running Maintenance scripts.
*
* @param string $mode Either "run" or "enqueue" [default: "run"]
* @return bool Whether updates were allowed to run
* @internal For use by Maintenance
* @since 1.28
* @return bool Whether updates were allowed to run
*/
public static function tryOpportunisticExecute( $mode = 'run' ) {
public static function tryOpportunisticExecute(): bool {
// Leave execution up to the current loop if an update is already in progress
// or if updates are explicitly disabled
if ( self::getRecursiveExecutionStackDepth()
@ -297,7 +292,7 @@ class DeferredUpdates {
// Run the updates for this context if they will have outer transaction scope
if ( !self::areDatabaseTransactionsActive() ) {
self::doUpdates( $mode, self::ALL );
self::doUpdates( 'run', self::ALL );
return true;
}

4
tests/phpunit/includes/deferred/DeferredUpdatesTest.php
View file

@ -359,7 +359,7 @@ class DeferredUpdatesTest extends MediaWikiIntegrationTestCase {
DeferredUpdates::addCallableUpdate( $callback1 );
$this->assertEquals( [], $calls );
DeferredUpdates::tryOpportunisticExecute( 'run' );
DeferredUpdates::tryOpportunisticExecute();
$this->assertEquals( [], $calls );
$dbw = wfGetDB( DB_PRIMARY );
@ -375,7 +375,7 @@ class DeferredUpdatesTest extends MediaWikiIntegrationTestCase {
$this->assertEquals( [ 'oti' ], $calls );
DeferredUpdates::tryOpportunisticExecute( 'run' );
DeferredUpdates::tryOpportunisticExecute();
$this->assertEquals( [ 'oti', 1, 2 ], $calls );
}