X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fdb%2Floadbalancer%2FLBFactoryMulti.php;h=f8ddd123f2e029e7acc6a3c1c9b3add99efe0258;hb=4bd607325a52db9711f41f49c6fc8f7d831fd19d;hp=e58aead8e1938ac39e0a684f1df74ef2e42baf7f;hpb=abb7c6792fab5e9a6e0c088dd820fd3d74c13059;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/db/loadbalancer/LBFactoryMulti.php b/includes/db/loadbalancer/LBFactoryMulti.php
index e58aead8e1..f8ddd123f2 100644
--- a/includes/db/loadbalancer/LBFactoryMulti.php
+++ b/includes/db/loadbalancer/LBFactoryMulti.php
@@ -95,16 +95,16 @@ class LBFactoryMulti extends LBFactory {
 	// Optional settings
 
 	/** @var array A 3-d map giving server load ratios for each section and group */
-	private $groupLoadsBySection = array();
+	private $groupLoadsBySection = [];
 
 	/** @var array A 3-d map giving server load ratios by DB name */
-	private $groupLoadsByDB = array();
+	private $groupLoadsByDB = [];
 
 	/** @var array A map of hostname to IP address */
-	private $hostsByName = array();
+	private $hostsByName = [];
 
 	/** @var array A map of external storage cluster name to server load map */
-	private $externalLoads = array();
+	private $externalLoads = [];
 
 	/**
 	 * @var array A set of server info keys overriding serverTemplate for
@@ -129,7 +129,7 @@ class LBFactoryMulti extends LBFactory {
 	 * @var array|bool A map of section name to read-only message. Missing or
 	 * false for read/write
 	 */
-	private $readOnlyBySection = array();
+	private $readOnlyBySection = [];
 
 	// Other stuff
 
@@ -137,10 +137,10 @@ class LBFactoryMulti extends LBFactory {
 	private $conf;
 
 	/** @var LoadBalancer[] */
-	private $mainLBs = array();
+	private $mainLBs = [];
 
 	/** @var LoadBalancer[] */
-	private $extLBs = array();
+	private $extLBs = [];
 
 	/** @var string */
 	private $loadMonitorClass;
@@ -159,11 +159,11 @@ class LBFactoryMulti extends LBFactory {
 		parent::__construct( $conf );
 
 		$this->conf = $conf;
-		$required = array( 'sectionsByDB', 'sectionLoads', 'serverTemplate' );
-		$optional = array( 'groupLoadsBySection', 'groupLoadsByDB', 'hostsByName',
+		$required = [ 'sectionsByDB', 'sectionLoads', 'serverTemplate' ];
+		$optional = [ 'groupLoadsBySection', 'groupLoadsByDB', 'hostsByName',
 			'externalLoads', 'externalTemplateOverrides', 'templateOverridesByServer',
 			'templateOverridesByCluster', 'masterTemplateOverrides',
-			'readOnlyBySection', 'loadMonitorClass' );
+			'readOnlyBySection', 'loadMonitorClass' ];
 
 		foreach ( $required as $key ) {
 			if ( !isset( $conf[$key] ) ) {
@@ -209,7 +209,7 @@ class LBFactoryMulti extends LBFactory {
 		if ( isset( $this->groupLoadsByDB[$dbName] ) ) {
 			$groupLoads = $this->groupLoadsByDB[$dbName];
 		} else {
-			$groupLoads = array();
+			$groupLoads = [];
 		}
 
 		if ( isset( $this->groupLoadsBySection[$section] ) ) {
@@ -238,7 +238,7 @@ class LBFactoryMulti extends LBFactory {
 		$section = $this->getSectionForWiki( $wiki );
 		if ( !isset( $this->mainLBs[$section] ) ) {
 			$lb = $this->newMainLB( $wiki );
-			$lb->parentInfo( array( 'id' => "main-$section" ) );
+			$lb->parentInfo( [ 'id' => "main-$section" ] );
 			$this->chronProt->initLB( $lb );
 			$this->mainLBs[$section] = $lb;
 		}
@@ -267,7 +267,7 @@ class LBFactoryMulti extends LBFactory {
 		return $this->newLoadBalancer(
 			$template,
 			$this->externalLoads[$cluster],
-			array(),
+			[],
 			$this->readOnlyReason
 		);
 	}
@@ -280,7 +280,7 @@ class LBFactoryMulti extends LBFactory {
 	public function &getExternalLB( $cluster, $wiki = false ) {
 		if ( !isset( $this->extLBs[$cluster] ) ) {
 			$this->extLBs[$cluster] = $this->newExternalLB( $cluster, $wiki );
-			$this->extLBs[$cluster]->parentInfo( array( 'id' => "ext-$cluster" ) );
+			$this->extLBs[$cluster]->parentInfo( [ 'id' => "ext-$cluster" ] );
 			$this->chronProt->initLB( $this->extLBs[$cluster] );
 		}
 
@@ -297,11 +297,12 @@ class LBFactoryMulti extends LBFactory {
 	 * @return LoadBalancer
 	 */
 	private function newLoadBalancer( $template, $loads, $groupLoads, $readOnlyReason ) {
-		return new LoadBalancer( array(
+		return new LoadBalancer( [
 			'servers' => $this->makeServerArray( $template, $loads, $groupLoads ),
 			'loadMonitor' => $this->loadMonitorClass,
-			'readOnlyReason' => $readOnlyReason
-		) );
+			'readOnlyReason' => $readOnlyReason,
+			'trxProfiler' => $this->trxProfiler
+		] );
 	}
 
 	/**
@@ -313,7 +314,7 @@ class LBFactoryMulti extends LBFactory {
 	 * @return array
 	 */
 	private function makeServerArray( $template, $loads, $groupLoads ) {
-		$servers = array();
+		$servers = [];
 		$master = true;
 		$groupLoadsByServer = $this->reindexGroupLoads( $groupLoads );
 		foreach ( $groupLoadsByServer as $server => $stuff ) {
@@ -357,7 +358,7 @@ class LBFactoryMulti extends LBFactory {
 	 * @return array
 	 */
 	private function reindexGroupLoads( $groupLoads ) {
-		$reindexed = array();
+		$reindexed = [];
 		foreach ( $groupLoads as $group => $loads ) {
 			foreach ( $loads as $server => $load ) {
 				$reindexed[$server][$group] = $load;
@@ -376,7 +377,7 @@ class LBFactoryMulti extends LBFactory {
 		if ( $wiki === false ) {
 			global $wgDBname, $wgDBprefix;
 
-			return array( $wgDBname, $wgDBprefix );
+			return [ $wgDBname, $wgDBprefix ];
 		} else {
 			return wfSplitWikiID( $wiki );
 		}
@@ -389,12 +390,12 @@ class LBFactoryMulti extends LBFactory {
 	 * @param callable $callback
 	 * @param array $params
 	 */
-	public function forEachLB( $callback, array $params = array() ) {
+	public function forEachLB( $callback, array $params = [] ) {
 		foreach ( $this->mainLBs as $lb ) {
-			call_user_func_array( $callback, array_merge( array( $lb ), $params ) );
+			call_user_func_array( $callback, array_merge( [ $lb ], $params ) );
 		}
 		foreach ( $this->extLBs as $lb ) {
-			call_user_func_array( $callback, array_merge( array( $lb ), $params ) );
+			call_user_func_array( $callback, array_merge( [ $lb ], $params ) );
 		}
 	}
 
@@ -402,6 +403,6 @@ class LBFactoryMulti extends LBFactory {
 		if ( !( $flags & self::SHUTDOWN_NO_CHRONPROT ) ) {
 			$this->shutdownChronologyProtector( $this->chronProt );
 		}
-		$this->commitMasterChanges(); // sanity
+		$this->commitMasterChanges( __METHOD__ ); // sanity
 	}
 }