From c39a4530b0cc833cb02b545c8806f59ac2900d73 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 3 Mar 2015 13:18:18 -0800 Subject: [PATCH] Made master connection expectations actually work MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Bug: –T86862 Change-Id: If918904c6c02ea83473dfaf34dfc2787ab610c6f --- includes/db/Database.php | 4 ---- includes/db/LoadBalancer.php | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index 1a7a97d3ed..b3c81f9bf6 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -817,10 +817,6 @@ abstract class DatabaseBase implements IDatabase { if ( $user ) { $this->open( $server, $user, $password, $dbName ); } - - $isMaster = !is_null( $this->getLBInfo( 'master' ) ); - $trxProf = $this->getTransactionProfiler(); - $trxProf->recordConnection( $this->mServer, $this->mDBname, $isMaster ); } /** diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php index 917d703304..dd95844811 100644 --- a/includes/db/LoadBalancer.php +++ b/includes/db/LoadBalancer.php @@ -756,6 +756,10 @@ class LoadBalancer { $db = $e->db; } + $isMaster = !empty( $server['master'] ); + $trxProf = Profiler::instance()->getTransactionProfiler(); + $trxProf->recordConnection( $server['host'], $server['dbname'], $isMaster ); + $db->setLBInfo( $server ); if ( isset( $server['fakeSlaveLag'] ) ) { $db->setFakeSlaveLag( $server['fakeSlaveLag'] ); -- 2.20.1