From 8ee45c99be57203dc2be19f2f0c258bfac553be8 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 27 Aug 2018 11:50:24 -0700 Subject: [PATCH] rdbms: make LBFactorySingle/LoadBalancerSingle set the local domain from the connection Change-Id: I657cea85ae3838bc76e7eb50b9ca66db16746bde --- includes/libs/rdbms/lbfactory/LBFactorySingle.php | 6 +++++- includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/includes/libs/rdbms/lbfactory/LBFactorySingle.php b/includes/libs/rdbms/lbfactory/LBFactorySingle.php index 2c1a782a53..60044baa9c 100644 --- a/includes/libs/rdbms/lbfactory/LBFactorySingle.php +++ b/includes/libs/rdbms/lbfactory/LBFactorySingle.php @@ -56,7 +56,11 @@ class LBFactorySingle extends LBFactory { * @since 1.28 */ public static function newFromConnection( IDatabase $db, array $params = [] ) { - return new static( [ 'connection' => $db ] + $params ); + return new static( array_merge( + [ 'localDomain' => $db->getDomainID() ], + $params, + [ 'connection' => $db ] + ) ); } /** diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php b/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php index 1b72502b14..5c0af119be 100644 --- a/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php +++ b/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php @@ -54,7 +54,8 @@ class LoadBalancerSingle extends LoadBalancer { ], 'trxProfiler' => $params['trxProfiler'] ?? null, 'srvCache' => $params['srvCache'] ?? null, - 'wanCache' => $params['wanCache'] ?? null + 'wanCache' => $params['wanCache'] ?? null, + 'localDomain' => $params['localDomain'] ?? $this->db->getDomainID() ] ); if ( isset( $params['readOnlyReason'] ) ) { @@ -69,7 +70,11 @@ class LoadBalancerSingle extends LoadBalancer { * @since 1.28 */ public static function newFromConnection( IDatabase $db, array $params = [] ) { - return new static( [ 'connection' => $db ] + $params ); + return new static( array_merge( + [ 'localDomain' => $db->getDomainID() ], + $params, + [ 'connection' => $db ] + ) ); } protected function reallyOpenConnection( array $server, DatabaseDomain $domainOverride ) { -- 2.20.1