diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2024-09-24 21:23:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2024-09-24 21:23:50 +0000 |
| commit | 60a8d322c52fcf3360b8ff67f5290be727286c10 (patch) | |
| tree | 240d8a8de88ef773d387080a4bfec96b78316bc6 /maintenance | |
| parent | c61aca4101279674fe41f885ebe37ce3bbb6f90d (diff) | |
| parent | be8eabd6843eb3a25da5e6c15506aebdaf0d3ef7 (diff) | |
| download | mediawikicore-60a8d322c52fcf3360b8ff67f5290be727286c10.tar.gz mediawikicore-60a8d322c52fcf3360b8ff67f5290be727286c10.zip | |
Merge "externalstore: cleanup ExternalStoreDB::getTable() and fix callers"
Diffstat (limited to 'maintenance')
| -rw-r--r-- | maintenance/storage/checkStorage.php | 4 | ||||
| -rw-r--r-- | maintenance/storage/trackBlobs.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/maintenance/storage/checkStorage.php b/maintenance/storage/checkStorage.php index 5d1a85e9b366..75c6c722db7f 100644 --- a/maintenance/storage/checkStorage.php +++ b/maintenance/storage/checkStorage.php @@ -236,7 +236,7 @@ class CheckStorage extends Maintenance { foreach ( $externalConcatBlobs as $cluster => $xBlobIds ) { $blobIds = array_keys( $xBlobIds ); $extDb = $this->dbStore->getReplica( $cluster ); - $blobsTable = $this->dbStore->getTable( $extDb ); + $blobsTable = $this->dbStore->getTable( $cluster ); $res = $extDb->newSelectQueryBuilder() ->select( [ 'blob_id' ] ) ->from( $blobsTable ) @@ -435,7 +435,7 @@ class CheckStorage extends Maintenance { foreach ( $externalConcatBlobs as $cluster => $oldIds ) { $blobIds = array_keys( $oldIds ); $extDb = $this->dbStore->getReplica( $cluster ); - $blobsTable = $this->dbStore->getTable( $extDb ); + $blobsTable = $this->dbStore->getTable( $cluster ); $headerLength = strlen( self::CONCAT_HEADER ); $res = $extDb->newSelectQueryBuilder() ->select( [ 'blob_id', "LEFT(blob_text, $headerLength) AS header" ] ) diff --git a/maintenance/storage/trackBlobs.php b/maintenance/storage/trackBlobs.php index 0e3ba0dd54af..8fe041b36d24 100644 --- a/maintenance/storage/trackBlobs.php +++ b/maintenance/storage/trackBlobs.php @@ -331,6 +331,8 @@ class TrackBlobs extends Maintenance { $dbw = $this->getPrimaryDB(); $lbFactory = $this->getServiceContainer()->getDBLoadBalancerFactory(); + $dbStore = $this->getServiceContainer()->getExternalStoreFactory()->getStore( 'DB' ); + '@phan-var ExternalStoreDB $dbStore'; /** @var ExternalStoreDB $dbStore */ foreach ( $this->clusters as $cluster ) { echo "Searching for orphan blobs in $cluster...\n"; @@ -345,7 +347,7 @@ class TrackBlobs extends Maintenance { } continue; } - $table = $extDB->getLBInfo( 'blobs table' ) ?? 'blobs'; + $table = $dbStore->getTable( $cluster ); if ( !$extDB->tableExists( $table, __METHOD__ ) ) { echo "No blobs table on cluster $cluster\n"; continue; |