Albert221 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395148 )
Change subject: Replace wfWaitForSlaves() with not deprecated method
......................................................................
Replace wfWaitForSlaves() with not deprecated method
Change-Id: I61251876dcd3f2a6de6d893f9c49f045390e21df
---
M maintenance/archives/upgradeLogging.php
M maintenance/cleanupEmptyCategories.php
M maintenance/cleanupInvalidDbKeys.php
M maintenance/cleanupUploadStash.php
M maintenance/cleanupUsersWithNoId.php
M maintenance/convertUserOptions.php
M maintenance/deleteBatch.php
M maintenance/deleteDefaultMessages.php
M maintenance/deleteEqualMessages.php
M maintenance/deleteSelfExternals.php
M maintenance/fixDefaultJsonContentPages.php
M maintenance/fixExtLinksProtocolRelative.php
M maintenance/fixUserRegistration.php
M maintenance/importDump.php
M maintenance/importImages.php
M maintenance/initEditCount.php
M maintenance/makeTestEdits.php
M maintenance/migrateComments.php
M maintenance/migrateUserGroup.php
M maintenance/moveBatch.php
M maintenance/namespaceDupes.php
M maintenance/populateBacklinkNamespace.php
M maintenance/populateCategory.php
M maintenance/populateContentModel.php
M maintenance/populateFilearchiveSha1.php
M maintenance/populateImageSha1.php
M maintenance/populateLogSearch.php
M maintenance/populateLogUsertext.php
M maintenance/populateParentId.php
M maintenance/populateRecentChangesSource.php
M maintenance/populateRevisionLength.php
M maintenance/populateRevisionSha1.php
M maintenance/rebuildrecentchanges.php
M maintenance/recountCategories.php
M maintenance/refreshImageMetadata.php
M maintenance/refreshLinks.php
M maintenance/removeInvalidEmails.php
M maintenance/resetUserTokens.php
M maintenance/runBatchedQuery.php
M maintenance/sql.php
M maintenance/storage/compressOld.php
M maintenance/storage/fixT22757.php
M maintenance/storage/moveToExternal.php
M maintenance/storage/resolveStubs.php
M maintenance/storage/trackBlobs.php
M maintenance/tidyUpBug37714.php
M maintenance/update.php
M maintenance/updateCollation.php
M maintenance/updateRestrictions.php
M maintenance/updateSpecialPages.php
50 files changed, 81 insertions(+), 80 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/48/395148/1
diff --git a/maintenance/archives/upgradeLogging.php
b/maintenance/archives/upgradeLogging.php
index 13362e0..fcc883a 100644
--- a/maintenance/archives/upgradeLogging.php
+++ b/maintenance/archives/upgradeLogging.php
@@ -175,7 +175,7 @@
$this->dbw->insert( $dstTable, $batch, __METHOD__ );
$numRowsCopied += count( $batch );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
echo "Copied $numRowsCopied rows\n";
}
diff --git a/maintenance/cleanupEmptyCategories.php
b/maintenance/cleanupEmptyCategories.php
index 2d22704..851a550 100644
--- a/maintenance/cleanupEmptyCategories.php
+++ b/maintenance/cleanupEmptyCategories.php
@@ -134,7 +134,7 @@
}
$this->output( "--mode=$mode --begin=$name\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
usleep( $throttle * 1000 );
}
@@ -188,7 +188,7 @@
$this->output( "--mode=remove --begin=$name\n"
);
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
usleep( $throttle * 1000 );
}
}
diff --git a/maintenance/cleanupInvalidDbKeys.php
b/maintenance/cleanupInvalidDbKeys.php
index 569fd2b..44e9844 100644
--- a/maintenance/cleanupInvalidDbKeys.php
+++ b/maintenance/cleanupInvalidDbKeys.php
@@ -235,7 +235,7 @@
__METHOD__ );
$affectedRowCount +=
$dbw->affectedRows();
}
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->outputStatus( "Updated $affectedRowCount
rows on $table.\n" );
break;
@@ -248,7 +248,7 @@
// recently, so we can just remove these rows.
$this->outputStatus( "Deleting invalid $table
rows...\n" );
$dbw->delete( $table, [ $idField => $ids ],
__METHOD__ );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->outputStatus( 'Deleted ' .
$dbw->affectedRows() . " rows from $table.\n" );
break;
@@ -264,7 +264,7 @@
__METHOD__ );
$affectedRowCount +=
$dbw->affectedRows();
}
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->outputStatus( "Deleted $affectedRowCount
rows from $table.\n" );
break;
@@ -286,7 +286,7 @@
__METHOD__ );
}
}
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->outputStatus( "Link update jobs have
been added to the job queue.\n" );
break;
}
diff --git a/maintenance/cleanupUploadStash.php
b/maintenance/cleanupUploadStash.php
index aeaf150..189d28c 100644
--- a/maintenance/cleanupUploadStash.php
+++ b/maintenance/cleanupUploadStash.php
@@ -87,7 +87,7 @@
$this->output( "Failed removing stashed
upload with key: $key ($type)\n" );
}
if ( $i % 100 == 0 ) {
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->output( "$i\n" );
}
}
diff --git a/maintenance/cleanupUsersWithNoId.php
b/maintenance/cleanupUsersWithNoId.php
index 74167d1..23ed90c 100644
--- a/maintenance/cleanupUsersWithNoId.php
+++ b/maintenance/cleanupUsersWithNoId.php
@@ -199,7 +199,7 @@
list( $next, $display ) = $this->makeNextCond( $dbw,
$orderby, $row );
$this->output( "... $display\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output(
diff --git a/maintenance/convertUserOptions.php
b/maintenance/convertUserOptions.php
index 501f045..6bfeb20 100644
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -23,8 +23,8 @@
require_once __DIR__ . '/Maintenance.php';
-use Wikimedia\Rdbms\ResultWrapper;
use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\ResultWrapper;
/**
* Maintenance script to convert user options to the new `user_properties`
table.
@@ -66,7 +66,7 @@
);
$id = $this->convertOptionBatch( $res, $dbw );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
if ( $id ) {
$this->output( "--Converted to ID $id\n" );
diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index eceadc1..eb69de0 100644
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -119,7 +119,7 @@
if ( $interval ) {
sleep( $interval );
}
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
}
diff --git a/maintenance/deleteDefaultMessages.php
b/maintenance/deleteDefaultMessages.php
index 417aa03..8888b24 100644
--- a/maintenance/deleteDefaultMessages.php
+++ b/maintenance/deleteDefaultMessages.php
@@ -82,7 +82,7 @@
$dbw = $this->getDB( DB_MASTER );
foreach ( $res as $row ) {
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$dbw->ping();
$title = Title::makeTitle( $row->page_namespace,
$row->page_title );
$page = WikiPage::factory( $title );
diff --git a/maintenance/deleteEqualMessages.php
b/maintenance/deleteEqualMessages.php
index 2a1fe22..2d8fa94 100644
--- a/maintenance/deleteEqualMessages.php
+++ b/maintenance/deleteEqualMessages.php
@@ -176,7 +176,7 @@
$this->output( "\n...deleting equal messages (this may take a
long time!)..." );
$dbw = $this->getDB( DB_MASTER );
foreach ( $messageInfo['results'] as $result ) {
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$dbw->ping();
$title = Title::makeTitle( NS_MEDIAWIKI,
$result['title'] );
$this->output( "\n* [[$title]]" );
diff --git a/maintenance/deleteSelfExternals.php
b/maintenance/deleteSelfExternals.php
index ab25784..fc30f10 100644
--- a/maintenance/deleteSelfExternals.php
+++ b/maintenance/deleteSelfExternals.php
@@ -41,7 +41,7 @@
$this->output( "Deleting self externals from $wgServer\n" );
$db = $this->getDB( DB_MASTER );
while ( 1 ) {
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->commitTransaction( $db, __METHOD__ );
$q = $db->limitResult( "DELETE /* deleteSelfExternals
*/ FROM externallinks WHERE el_to"
. $db->buildLike( $wgServer . '/',
$db->anyString() ), $this->getBatchSize() );
diff --git a/maintenance/fixDefaultJsonContentPages.php
b/maintenance/fixDefaultJsonContentPages.php
index 7262770..a3a8a22 100644
--- a/maintenance/fixDefaultJsonContentPages.php
+++ b/maintenance/fixDefaultJsonContentPages.php
@@ -94,7 +94,7 @@
__METHOD__
);
$this->output( "done.\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
} else {
// Not JSON...force it to wikitext. We need to
update the
// revision table so that these revisions are
always processed
@@ -114,7 +114,7 @@
[ 'rev_content_model' =>
CONTENT_MODEL_WIKITEXT ],
[ 'rev_page' => $row->page_id,
'rev_id' => $chunk ]
);
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output( "done.\n" );
}
diff --git a/maintenance/fixExtLinksProtocolRelative.php
b/maintenance/fixExtLinksProtocolRelative.php
index 97cd37e..e4cebb5 100644
--- a/maintenance/fixExtLinksProtocolRelative.php
+++ b/maintenance/fixExtLinksProtocolRelative.php
@@ -63,7 +63,7 @@
$count++;
if ( $count % 100 == 0 ) {
$this->output( $count . "\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$db->insert( 'externallinks',
[
diff --git a/maintenance/fixUserRegistration.php
b/maintenance/fixUserRegistration.php
index 30364c6..a22c863 100644
--- a/maintenance/fixUserRegistration.php
+++ b/maintenance/fixUserRegistration.php
@@ -81,7 +81,7 @@
}
}
$this->output( "Waiting for replica DBs..." );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->output( " done.\n" );
} while ( $res->numRows() >= $this->getBatchSize() );
}
diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index b6bbc2a..cc34ea1 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -256,7 +256,7 @@
$this->progress( "$this->revCount ($revrate
revs/sec)" );
}
}
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
function progress( $string ) {
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index d3aa280..4ca4dc2 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -355,7 +355,7 @@
$this->output( "\nWaiting for
replica DBs...\n" );
// Wait for replica DBs.
sleep( 2.0 ); # Why this sleep?
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->output( "\nSetting image
restrictions ... " );
diff --git a/maintenance/initEditCount.php b/maintenance/initEditCount.php
index 96aea03..8d8d5aa 100644
--- a/maintenance/initEditCount.php
+++ b/maintenance/initEditCount.php
@@ -89,7 +89,7 @@
$delta,
$rate ) );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
} else {
$this->output( "Using single-query mode...\n" );
diff --git a/maintenance/makeTestEdits.php b/maintenance/makeTestEdits.php
index cfd5fc2..9633a90 100644
--- a/maintenance/makeTestEdits.php
+++ b/maintenance/makeTestEdits.php
@@ -56,7 +56,7 @@
$this->output( "Edited $title\n" );
if ( $i && ( $i % $this->getBatchSize() ) == 0 ) {
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
diff --git a/maintenance/migrateComments.php b/maintenance/migrateComments.php
index c000871..f7522cf 100644
--- a/maintenance/migrateComments.php
+++ b/maintenance/migrateComments.php
@@ -144,7 +144,7 @@
$primaryKey = (array)$primaryKey;
$pkFilter = array_flip( $primaryKey );
$this->output( "Beginning migration of $table.$oldField to
$table.$newField\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$dbw = $this->getDB( DB_MASTER );
$next = '1=1';
@@ -207,7 +207,7 @@
}
$prompt = join( ' ', array_reverse( $prompt ) );
$this->output( "... $prompt\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output(
@@ -233,7 +233,7 @@
protected function migrateToTemp( $table, $primaryKey, $oldField,
$newPrimaryKey, $newField ) {
$newTable = $table . '_comment_temp';
$this->output( "Beginning migration of $table.$oldField to
$newTable.$newField\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$dbw = $this->getDB( DB_MASTER );
$next = [];
@@ -282,7 +282,7 @@
// Calculate the "next" condition
$next = [ $primaryKey . ' > ' . $dbw->addQuotes(
$row->$primaryKey ) ];
$this->output( "... {$row->$primaryKey}\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output(
diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php
index 81c2353..afb1d9c 100644
--- a/maintenance/migrateUserGroup.php
+++ b/maintenance/migrateUserGroup.php
@@ -100,7 +100,7 @@
$count += $affected;
$blockStart += $batchSize;
$blockEnd += $batchSize;
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output( "Done! $count users in group '$oldGroup' are now
in '$newGroup' instead.\n" );
}
diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index fa25a06..489aff5 100644
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -118,7 +118,7 @@
if ( $interval ) {
sleep( $interval );
}
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
}
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 84d4533..62f8622 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -28,8 +28,8 @@
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\ResultWrapper;
use Wikimedia\Rdbms\IMaintainableDatabase;
+use Wikimedia\Rdbms\ResultWrapper;
/**
* Maintenance script that checks for articles to fix after
@@ -407,7 +407,7 @@
"$titleField > $encLastTitle " .
"OR ($titleField = $encLastTitle AND $fromField
> $encLastFrom)" ];
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
diff --git a/maintenance/populateBacklinkNamespace.php
b/maintenance/populateBacklinkNamespace.php
index eb82806..23421d4 100644
--- a/maintenance/populateBacklinkNamespace.php
+++ b/maintenance/populateBacklinkNamespace.php
@@ -88,7 +88,7 @@
}
$blockStart += $batchSize - 1;
$blockEnd += $batchSize - 1;
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
return true;
}
diff --git a/maintenance/populateCategory.php b/maintenance/populateCategory.php
index 5dccdd6..83306c3 100644
--- a/maintenance/populateCategory.php
+++ b/maintenance/populateCategory.php
@@ -128,7 +128,7 @@
++$i;
if ( !( $i % self::REPORTING_INTERVAL ) ) {
$this->output( "$name\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
usleep( $throttle * 1000 );
}
diff --git a/maintenance/populateContentModel.php
b/maintenance/populateContentModel.php
index a4fac05..867d858 100644
--- a/maintenance/populateContentModel.php
+++ b/maintenance/populateContentModel.php
@@ -23,8 +23,8 @@
require_once __DIR__ . '/Maintenance.php';
-use Wikimedia\Rdbms\IDatabase;
use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\IDatabase;
/**
* Usage:
@@ -89,7 +89,7 @@
[ 'page_id' => $pageIds ],
__METHOD__
);
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->output( "done.\n" );
}
@@ -227,7 +227,7 @@
[ $key => $id ],
__METHOD__
);
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->clearCache(
$row->{$page_id_column}, $row->{$rev_id_column} );
$this->output( "done.\n" );
continue;
diff --git a/maintenance/populateFilearchiveSha1.php
b/maintenance/populateFilearchiveSha1.php
index cbd969d..dbf875c 100644
--- a/maintenance/populateFilearchiveSha1.php
+++ b/maintenance/populateFilearchiveSha1.php
@@ -94,7 +94,7 @@
// print status and let replica DBs catch up
$this->output( sprintf(
"id %d done (up to %d), %5.3f%% \r", $lastId,
$endId, $lastId / $endId * 100 ) );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
} while ( true );
$processingTime = microtime( true ) - $startTime;
diff --git a/maintenance/populateImageSha1.php
b/maintenance/populateImageSha1.php
index 84b65ee..28022f6 100644
--- a/maintenance/populateImageSha1.php
+++ b/maintenance/populateImageSha1.php
@@ -120,7 +120,7 @@
if ( $i % $this->getBatchSize() == 0 ) {
$this->output( sprintf(
"Done %d of %d, %5.3f%% \r", $i,
$numRows, $i / $numRows * 100 ) );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$file = wfLocalFile( $row->img_name );
diff --git a/maintenance/populateLogSearch.php
b/maintenance/populateLogSearch.php
index 113cc63..7f32b05 100644
--- a/maintenance/populateLogSearch.php
+++ b/maintenance/populateLogSearch.php
@@ -161,7 +161,7 @@
}
$blockStart += $batchSize;
$blockEnd += $batchSize;
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output( "Done populating log_search table.\n" );
diff --git a/maintenance/populateLogUsertext.php
b/maintenance/populateLogUsertext.php
index c5c079a..3ede867 100644
--- a/maintenance/populateLogUsertext.php
+++ b/maintenance/populateLogUsertext.php
@@ -76,7 +76,7 @@
$this->commitTransaction( $db, __METHOD__ );
$blockStart += $batchSize;
$blockEnd += $batchSize;
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output( "Done populating log_user_text field.\n" );
diff --git a/maintenance/populateParentId.php b/maintenance/populateParentId.php
index 99c2b23..ce8a257 100644
--- a/maintenance/populateParentId.php
+++ b/maintenance/populateParentId.php
@@ -119,7 +119,7 @@
}
$blockStart += $batchSize;
$blockEnd += $batchSize;
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output( "rev_parent_id population complete ... {$count}
rows [{$changed} changed]\n" );
diff --git a/maintenance/populateRecentChangesSource.php
b/maintenance/populateRecentChangesSource.php
index 04ad255..87fb267 100644
--- a/maintenance/populateRecentChangesSource.php
+++ b/maintenance/populateRecentChangesSource.php
@@ -71,7 +71,7 @@
);
$this->output( "." );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$blockStart += $batchSize;
$blockEnd += $batchSize;
diff --git a/maintenance/populateRevisionLength.php
b/maintenance/populateRevisionLength.php
index cc1a9f1..d7c0f8c 100644
--- a/maintenance/populateRevisionLength.php
+++ b/maintenance/populateRevisionLength.php
@@ -117,7 +117,7 @@
$blockStart += $batchSize;
$blockEnd += $batchSize;
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
return $count;
diff --git a/maintenance/populateRevisionSha1.php
b/maintenance/populateRevisionSha1.php
index f3506ec..be4f5b1 100644
--- a/maintenance/populateRevisionSha1.php
+++ b/maintenance/populateRevisionSha1.php
@@ -109,7 +109,7 @@
$blockStart += $batchSize;
$blockEnd += $batchSize;
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
return $count;
@@ -135,7 +135,7 @@
$updateSize = 0;
$this->commitTransaction( $db, __METHOD__ );
$this->output( "Commited row with
ar_timestamp={$row->ar_timestamp}\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->beginTransaction( $db, __METHOD__ );
}
}
diff --git a/maintenance/rebuildrecentchanges.php
b/maintenance/rebuildrecentchanges.php
index bbf91f5..37c8ae5 100644
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -24,6 +24,7 @@
*/
require_once __DIR__ . '/Maintenance.php';
+
use MediaWiki\MediaWikiServices;
/**
@@ -111,7 +112,7 @@
);
foreach ( array_chunk( $rcids, $this->getBatchSize() ) as
$rcidBatch ) {
$dbw->delete( 'recentchanges', [ 'rc_id' => $rcidBatch
], __METHOD__ );
- wfGetLBFactory()->waitForReplication();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output( "Loading from page and revision tables...\n" );
@@ -167,7 +168,7 @@
__METHOD__
);
if ( ( ++$inserted % $this->getBatchSize() ) == 0 ) {
- wfGetLBFactory()->waitForReplication();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
}
@@ -257,7 +258,7 @@
$lastSize = $size;
if ( ( ++$updated % $this->getBatchSize() ) ==
0 ) {
- wfGetLBFactory()->waitForReplication();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
}
@@ -341,7 +342,7 @@
);
if ( ( ++$inserted % $this->getBatchSize() ) == 0 ) {
- wfGetLBFactory()->waitForReplication();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
}
@@ -399,7 +400,7 @@
[ 'rc_id' => $rcidBatch ],
__METHOD__
);
- wfGetLBFactory()->waitForReplication();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
}
@@ -475,7 +476,7 @@
);
if ( ( ++$updates % $this->getBatchSize() ) == 0 ) {
- wfGetLBFactory()->waitForReplication();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
}
diff --git a/maintenance/recountCategories.php
b/maintenance/recountCategories.php
index ed6a357..a5f9194 100644
--- a/maintenance/recountCategories.php
+++ b/maintenance/recountCategories.php
@@ -162,7 +162,7 @@
$affectedRows += $dbw->affectedRows();
}
-
MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
+
MediaWikiServices::getDBLoadBalancerFactory()->waitForReplication();
return $affectedRows;
}
diff --git a/maintenance/refreshImageMetadata.php
b/maintenance/refreshImageMetadata.php
index dcfed11..6904c01 100644
--- a/maintenance/refreshImageMetadata.php
+++ b/maintenance/refreshImageMetadata.php
@@ -194,7 +194,7 @@
}
}
$conds2 = [ 'img_name > ' . $dbw->addQuotes(
$row->img_name ) ];
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
} while ( $res->numRows() === $batchSize );
$total = $upgraded + $leftAlone;
diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index 4fab146..978ec09 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -139,7 +139,7 @@
foreach ( $res as $row ) {
if ( !( ++$i % self::REPORTING_INTERVAL ) ) {
$this->output( "$i\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->fixRedirect( $row->page_id );
}
@@ -160,7 +160,7 @@
foreach ( $res as $row ) {
if ( !( ++$i % self::REPORTING_INTERVAL ) ) {
$this->output( "$i\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
if ( $redirectsOnly ) {
$this->fixRedirect( $row->page_id );
@@ -180,7 +180,7 @@
for ( $id = $start; $id <= $end; $id++ ) {
if ( !( $id % self::REPORTING_INTERVAL ) ) {
$this->output( "$id\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->fixRedirect( $id );
}
@@ -192,7 +192,7 @@
for ( $id = $start; $id <= $end; $id++ ) {
if ( !( $id % self::REPORTING_INTERVAL
) ) {
$this->output( "$id\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
self::fixLinksFromArticle( $id,
$this->namespace );
}
@@ -294,7 +294,7 @@
private function deleteLinksFromNonexistent( $start = null, $end =
null, $batchSize = 100,
$chunkSize = 100000
) {
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->output( "Deleting illegal entries from the links
tables...\n" );
$dbr = $this->getDB( DB_REPLICA, [ 'vslow' ] );
do {
@@ -374,7 +374,7 @@
$dbw->delete( $table, [ $field => $ids
], __METHOD__ );
$this->output( ", $counter" );
$tableStart = $ids[$numIds - 1] + 1;
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
} while ( $numIds >= $batchSize && ( $end === null ||
$tableStart <= $end ) );
@@ -463,7 +463,7 @@
foreach ( $res as $row ) {
if ( !( ++$i % self::REPORTING_INTERVAL ) ) {
$this->output( "$i\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$lastId = $row->page_id;
$timestamp = $row->cl_timestamp;
diff --git a/maintenance/removeInvalidEmails.php
b/maintenance/removeInvalidEmails.php
index 91025bf..74364e1 100644
--- a/maintenance/removeInvalidEmails.php
+++ b/maintenance/removeInvalidEmails.php
@@ -63,7 +63,7 @@
foreach ( $badIds as $badId ) {
User::newFromId( $badId
)->invalidateCache();
}
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
} else {
$this->output( "Would have removed
$badCount emails from the database.\n" );
diff --git a/maintenance/resetUserTokens.php b/maintenance/resetUserTokens.php
index 710198b..722c05e 100644
--- a/maintenance/resetUserTokens.php
+++ b/maintenance/resetUserTokens.php
@@ -101,7 +101,7 @@
$min = $max;
$max = $min + $this->getBatchSize();
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
} while ( $min <= $maxid );
}
diff --git a/maintenance/runBatchedQuery.php b/maintenance/runBatchedQuery.php
index b0a2b92..3b0eeaf 100644
--- a/maintenance/runBatchedQuery.php
+++ b/maintenance/runBatchedQuery.php
@@ -102,7 +102,7 @@
$affected = $dbw->affectedRows();
$this->output( "$affected rows affected\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
} while ( $res->numRows() );
}
diff --git a/maintenance/sql.php b/maintenance/sql.php
index 8e276e7..26db10e 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -24,9 +24,9 @@
require_once __DIR__ . '/Maintenance.php';
-use Wikimedia\Rdbms\ResultWrapper;
-use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\DBQueryError;
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\ResultWrapper;
/**
* Maintenance script that sends SQL queries from the specified file to the
database.
@@ -106,7 +106,7 @@
if ( $this->hasOption( 'query' ) ) {
$query = $this->getOption( 'query' );
$this->sqlDoQuery( $db, $query, /* dieOnError */ true );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
return;
}
@@ -149,7 +149,7 @@
$prompt = $newPrompt;
$wholeLine = '';
}
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
protected function sqlDoQuery( IDatabase $db, $line, $dieOnError ) {
diff --git a/maintenance/storage/compressOld.php
b/maintenance/storage/compressOld.php
index 0ae46ae..f5a039e 100644
--- a/maintenance/storage/compressOld.php
+++ b/maintenance/storage/compressOld.php
@@ -305,7 +305,7 @@
# $conds[] = 'page_id=rev_page AND rev_id != page_latest';
for ( $pageId = $startId; $pageId <= $maxPageId; $pageId++ ) {
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
# Wake up
$dbr->ping();
@@ -463,7 +463,7 @@
$this->output( "/" );
$this->commitTransaction( $dbw, __METHOD__ );
$i += $thisChunkSize;
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output( "\n" );
}
diff --git a/maintenance/storage/fixT22757.php
b/maintenance/storage/fixT22757.php
index e8bd23d..a872ddd 100644
--- a/maintenance/storage/fixT22757.php
+++ b/maintenance/storage/fixT22757.php
@@ -258,7 +258,7 @@
static $iteration = 0;
++$iteration;
if ( ++$iteration > 50 == 0 ) {
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$iteration = 0;
}
}
diff --git a/maintenance/storage/moveToExternal.php
b/maintenance/storage/moveToExternal.php
index e117992..52ddd87 100644
--- a/maintenance/storage/moveToExternal.php
+++ b/maintenance/storage/moveToExternal.php
@@ -66,7 +66,7 @@
if ( !( $block % REPORTING_INTERVAL ) ) {
print "oldid=$blockStart, moved=$numMoved\n";
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$res = $dbr->select( 'text', [ 'old_id', 'old_flags',
'old_text' ],
diff --git a/maintenance/storage/resolveStubs.php
b/maintenance/storage/resolveStubs.php
index 8ca8bb2..0cf32df 100644
--- a/maintenance/storage/resolveStubs.php
+++ b/maintenance/storage/resolveStubs.php
@@ -43,7 +43,7 @@
$numBlocks = intval( $maxID / $blockSize ) + 1;
for ( $b = 0; $b < $numBlocks; $b++ ) {
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
printf( "%5.2f%%\n", $b / $numBlocks * 100 );
$start = intval( $maxID / $numBlocks ) * $b + 1;
diff --git a/maintenance/storage/trackBlobs.php
b/maintenance/storage/trackBlobs.php
index b4514ec..c1ea6a7 100644
--- a/maintenance/storage/trackBlobs.php
+++ b/maintenance/storage/trackBlobs.php
@@ -209,7 +209,7 @@
if ( $batchesDone >= $this->reportingInterval ) {
$batchesDone = 0;
echo "$startId / $endId\n";
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
echo "Found $rowsInserted revisions\n";
@@ -293,7 +293,7 @@
if ( $batchesDone >= $this->reportingInterval ) {
$batchesDone = 0;
echo "$startId / $endId\n";
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
echo "Found $rowsInserted orphan text rows\n";
diff --git a/maintenance/tidyUpBug37714.php b/maintenance/tidyUpBug37714.php
index 9d7cc0e..71a26d5 100644
--- a/maintenance/tidyUpBug37714.php
+++ b/maintenance/tidyUpBug37714.php
@@ -38,7 +38,7 @@
[ 'log_id' => $row->log_id ],
__METHOD__
);
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
}
}
diff --git a/maintenance/update.php b/maintenance/update.php
index 529c069..347b11f 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -120,7 +120,7 @@
$this->output( "MediaWiki {$wgVersion} Updater\n\n" );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
if ( !$this->hasOption( 'skip-compat-checks' ) ) {
$this->compatChecks();
diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 84fc2d2..4e86835 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -139,7 +139,7 @@
} else {
$this->output( "Fixing collation for $count
rows.\n" );
}
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$count = 0;
$batchCount = 0;
@@ -227,7 +227,7 @@
if ( !$dryRun && ++$batchCount % self::SYNC_INTERVAL ==
0 ) {
$this->output( "Waiting for replica DBs ... " );
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
$this->output( "done\n" );
}
} while ( $res->numRows() == self::BATCH_SIZE );
diff --git a/maintenance/updateRestrictions.php
b/maintenance/updateRestrictions.php
index c0b7b10..3fa146c 100644
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -108,7 +108,7 @@
}
$blockStart += $batchSize - 1;
$blockEnd += $batchSize - 1;
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
$this->output( "...removing dead rows from page_restrictions\n"
);
// Kill any broken rows from previous imports
diff --git a/maintenance/updateSpecialPages.php
b/maintenance/updateSpecialPages.php
index 58f23df..85ce082 100644
--- a/maintenance/updateSpecialPages.php
+++ b/maintenance/updateSpecialPages.php
@@ -128,7 +128,7 @@
$this->output( "Reconnected\n\n" );
}
# Wait for the replica DB to catch up
- wfWaitForSlaves();
+
\MediaWiki\MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->waitForReplication();
}
public function doSpecialPageCacheUpdates( $dbw ) {
--
To view, visit https://gerrit.wikimedia.org/r/395148
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61251876dcd3f2a6de6d893f9c49f045390e21df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Albert221 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
