X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Floadbalancer%2FLoadBalancerSingle.php;h=fcddfcf139c7ed2fa43ac6eb201c0f9bc90fe760;hb=10e2511f81d329c9ad401dd979e6ccd9fb64d987;hp=5c0af119bebd921ea7039d10f08143713001eb89;hpb=5081183c16f52388b8320e09e0578d450605d402;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php b/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php index 5c0af119be..fcddfcf139 100644 --- a/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php +++ b/includes/libs/rdbms/loadbalancer/LoadBalancerSingle.php @@ -26,7 +26,12 @@ namespace Wikimedia\Rdbms; use InvalidArgumentException; /** - * Trivial LoadBalancer that always returns an injected connection handle + * Trivial LoadBalancer that always returns an injected connection handle. + * + * Note that, while this LoadBalancer does not open any connections itself, + * it still closes the injected connection at times, including during destruction. + * It is therefore unsuitable for use in tests unless you have a Database instance + * separate from the main test database (which is expected to stay open). */ class LoadBalancerSingle extends LoadBalancer { /** @var IDatabase */ @@ -55,7 +60,8 @@ class LoadBalancerSingle extends LoadBalancer { 'trxProfiler' => $params['trxProfiler'] ?? null, 'srvCache' => $params['srvCache'] ?? null, 'wanCache' => $params['wanCache'] ?? null, - 'localDomain' => $params['localDomain'] ?? $this->db->getDomainID() + 'localDomain' => $params['localDomain'] ?? $this->db->getDomainID(), + 'readOnlyReason' => $params['readOnlyReason'] ?? false, ] ); if ( isset( $params['readOnlyReason'] ) ) { @@ -77,7 +83,7 @@ class LoadBalancerSingle extends LoadBalancer { ) ); } - protected function reallyOpenConnection( array $server, DatabaseDomain $domainOverride ) { + protected function reallyOpenConnection( array $server, DatabaseDomain $domain ) { return $this->db; } }