X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fstorage%2FrecompressTracked.php;h=316d2d2319bdbbec9c464f5076cd3923e6067b7f;hb=d8cc9ef907fbb76838f2726989aa642340c7eb38;hp=8a8f4d81bf7c123784ed132dd827e49efd9f7457;hpb=b5f06bbd12193e3f4dfa00342f882de8afb72c52;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php
index 8a8f4d81bf..316d2d2319 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';
@@ -218,6 +218,8 @@ class RecompressTracked {
 	 * writing are all slow.
 	 */
 	function startReplicaProcs() {
+		$wiki = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() );
+
 		$cmd = 'php ' . Shell::escape( __FILE__ );
 		foreach ( self::$cmdLineOptionMap as $cmdOption => $classOption ) {
 			if ( $cmdOption == 'replica-id' ) {
@@ -229,7 +231,7 @@ class RecompressTracked {
 			}
 		}
 		$cmd .= ' --child' .
-			' --wiki ' . Shell::escape( wfWikiID() ) .
+			' --wiki ' . Shell::escape( $wiki ) .
 			' ' . Shell::escape( ...$this->destClusters );
 
 		$this->replicaPipes = $this->replicaProcs = [];
@@ -273,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;
@@ -645,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 );
 	}
 
 	/**
@@ -707,7 +710,7 @@ class CgzCopyTransaction {
 	/** @var RecompressTracked */
 	public $parent;
 	public $blobClass;
-	/** @var ConcatenatedGzipHistoryBlob */
+	/** @var ConcatenatedGzipHistoryBlob|false */
 	public $cgz;
 	public $referrers;