Convert maintenance scripts to LoadBalancer::getMaintenanceConnectionRef()

Change-Id: I8944a052f51a1941ad3b76a40fc9c46d1363c426

3 files changed, 9 insertions, 8 deletions

diff --git a/maintenance/storage/orphanStats.php b/maintenance/storage/orphanStats.php
index 3866be70d090..60f88ba69888 100644
--- a/maintenance/storage/orphanStats.php
+++ b/maintenance/storage/orphanStats.php
@@ -42,7 +42,7 @@ class OrphanStats extends Maintenance {
 		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
 		$lb = $lbFactory->getExternalLB( $cluster );
 
-		return $lb->getConnection( DB_REPLICA );
+		return $lb->getMaintenanceConnectionRef( DB_REPLICA );
 	}
 
 	public function execute() {
diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php
index 6fd53ccd94d5..92b66792e757 100644
--- a/maintenance/storage/recompressTracked.php
+++ b/maintenance/storage/recompressTracked.php
@@ -22,10 +22,10 @@
  * @ingroup Maintenance ExternalStorage
  */
 
+use Wikimedia\Rdbms\IMaintainableDatabase;
 use MediaWiki\Logger\LegacyLogger;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Shell\Shell;
-use Wikimedia\Rdbms\IDatabase;
 
 $optionsWithArgs = RecompressTracked::getOptionsWithArgs();
 require __DIR__ . '/../commandLine.inc';
@@ -275,6 +275,7 @@ class RecompressTracked {
 	/**
 	 * Dispatch a command to the next available replica DB.
 	 * This may block until a replica DB finishes its work and becomes available.
+	 * @param array ...$args
 	 */
 	function dispatch( ...$args ) {
 		$pipes = $this->replicaPipes;
@@ -647,13 +648,13 @@ class RecompressTracked {
 	/**
 	 * Gets a DB master connection for the given external cluster name
 	 * @param string $cluster
-	 * @return IDatabase
+	 * @return IMaintainableDatabase
 	 */
 	function getExtDB( $cluster ) {
 		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
 		$lb = $lbFactory->getExternalLB( $cluster );
 
-		return $lb->getConnection( DB_MASTER );
+		return $lb->getMaintenanceConnectionRef( DB_MASTER );
 	}
 
 	/**
diff --git a/maintenance/storage/trackBlobs.php b/maintenance/storage/trackBlobs.php
index 385ae6a5a00e..d9793b40bcc2 100644
--- a/maintenance/storage/trackBlobs.php
+++ b/maintenance/storage/trackBlobs.php
@@ -232,7 +232,7 @@ class TrackBlobs {
 		$pos = $dbw->getMasterPos();
 		$dbr->masterPosWait( $pos, 100000 );
 
-		$textClause = $this->getTextClause( $this->clusters );
+		$textClause = $this->getTextClause();
 		$startId = 0;
 		$endId = $dbr->selectField( 'text', 'MAX(old_id)', '', __METHOD__ );
 		$rowsInserted = 0;
@@ -325,9 +325,9 @@ class TrackBlobs {
 			$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
 			$lb = $lbFactory->getExternalLB( $cluster );
 			try {
-				$extDB = $lb->getConnection( DB_REPLICA );
+				$extDB = $lb->getMaintenanceConnectionRef( DB_REPLICA );
 			} catch ( DBConnectionError $e ) {
-				if ( strpos( $e->error, 'Unknown database' ) !== false ) {
+				if ( strpos( $e->getMessage(), 'Unknown database' ) !== false ) {
 					echo "No database on $cluster\n";
 				} else {
 					echo "Error on $cluster: " . $e->getMessage() . "\n";
@@ -362,8 +362,8 @@ class TrackBlobs {
 
 				foreach ( $res as $row ) {
 					gmp_setbit( $actualBlobs, $row->blob_id );
+					$startId = $row->blob_id;
 				}
-				$startId = $row->blob_id;
 
 				++$batchesDone;
 				if ( $batchesDone >= $this->reportingInterval ) {