repo: Remove dumpDBDefaultGroup config

It can be done in a much simpler and easier way because of I973a45815d07de83

Depends-On: I973a45815d07de83c0fa0e5259b72732240911d5
Bug: T405087
Change-Id: I79ef110b0e762ddadd219c882f0e73a491995fe6

Author: Ladsgroup

repo/config/Wikibase.default.php

@@ -303,9 +303,6 @@
 	// Search profiles available in wbsearchentities & query+wbsearch
 	'searchProfiles' => [ 'default' => null ],
 
-	// DB group to use in dump maintenance scripts. Defaults to "dump", per T147169.
-	'dumpDBDefaultGroup' => 'dump',
-
 	'useKartographerGlobeCoordinateFormatter' => false,
 
 	'useKartographerMaplinkInWikitext' => false,

repo/maintenance/DumpEntities.php

@@ -3,14 +3,11 @@
 namespace Wikibase\Repo\Maintenance;
 
 use MediaWiki\Maintenance\Maintenance;
-use MediaWiki\Registration\ExtensionRegistry;
-use MediaWiki\Settings\SettingsBuilder;
 use Onoi\MessageReporter\ObservableMessageReporter;
 use Wikibase\DataModel\Services\EntityId\EntityIdPager;
 use Wikibase\DataModel\Services\Lookup\EntityLookupException;
 use Wikibase\Lib\Reporting\ExceptionHandler;
 use Wikibase\Lib\Reporting\ReportingExceptionHandler;
-use Wikibase\Lib\WikibaseSettings;
 use Wikibase\Repo\Dumpers\DumpGenerator;
 use Wikibase\Repo\IO\EntityIdReader;
 use Wikibase\Repo\IO\LineReader;
@@ -170,6 +167,14 @@ private function closeLogFile() {
 	 * Do the actual work. All child classes will need to implement this
 	 */
 	public function execute() {
+		if ( $this->hasOption( 'dbgroupdefault' ) ) {
+			// make sure Maintenance::getLBFactory() (private) applies the dbgroupdefault
+			// option to the LBFactory in the service container.
+			$this->getReplicaDB();
+		} else {
+			$this->getServiceContainer()->getDBLoadBalancerFactory()->setDefaultGroupName( 'dump' );
+		}
+
 		//TODO: more validation for options
 		$shardingFactor = (int)$this->getOption( 'sharding-factor', 1 );
 		$shard = (int)$this->getOption( 'shard', 0 );
@@ -251,38 +256,6 @@ public function execute() {
 		$this->closeLogFile();
 	}
 
-	/**
-	 * @inheritDoc
-	 */
-	public function finalSetup( SettingsBuilder $settingsBuilder ) {
-		parent::finalSetup( $settingsBuilder );
-
-		if ( $this->hasOption( 'dbgroupdefault' ) ) {
-			// A group was set via cli, so no need to set the default here
-			return;
-		}
-
-		$settingsBuilder->registerHookHandlers( [ 'MediaWikiServices' => [ function() {
-			global $wgDBDefaultGroup;
-			if ( !ExtensionRegistry::getInstance()->isLoaded( 'WikibaseRepository' ) ) {
-				// Something instantiates the MediaWikiServices before Wikibase
-				// is loaded, nothing we can do here.
-				wfWarn( self::class . ': Can not change default DB group.' );
-
-				return;
-			}
-
-			// Don't use WikibaseRepo or MediaWikiServices here as this is run very early on, thus
-			// the bootstrapping code is not ready yet (T202452).
-			$settings = WikibaseSettings::getRepoSettings();
-			$dumpDBDefaultGroup = $settings->getSetting( 'dumpDBDefaultGroup' );
-
-			if ( $dumpDBDefaultGroup !== null ) {
-				$wgDBDefaultGroup = $dumpDBDefaultGroup;
-			}
-		} ] ] );
-	}
-
 	/**
 	 * @return string[]
 	 */

repo/tests/phpunit/unit/RepoNoBadUsageTest.php

@@ -35,6 +35,7 @@ protected static function getBadPatternsWithAllowedUsages(): array {
 				'WikibaseRepo.ServiceWiring.php' => 2, // RepoDomainDbFactory+TermsDomainDbFactory service wiring
 				'tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php' => true, // mock
 				'tests/phpunit/unit/ServiceWiringTestCase.php' => true, // mock
+				'maintenance/DumpEntities.php' => 1, // To set the dump db group
 			],
 		];
 	}