Merge "rdbms: add type hint to reuseConnection()"

diff --combined includes/libs/rdbms/loadbalancer/LoadBalancer.php
index e95e23f,c87a919..569ea0e
--- 1/includes/libs/rdbms/loadbalancer/LoadBalancer.php
--- 2/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@@ -298,13 -298,11 +298,13 @@@ class LoadBalancer implements ILoadBala
                                $host = $this->getServerName( $i );
                                if ( $lag === false && !is_infinite( $maxServerLag ) ) {
                                        $this->replLogger->error(
 -                                              "Server {host} is not replicating?", [ 'host' => $host ] );
 +                                              __METHOD__ .
 +                                              ": server {host} is not replicating?", [ 'host' => $host ] );
                                        unset( $loads[$i] );
                                } elseif ( $lag > $maxServerLag ) {
                                        $this->replLogger->info(
 -                                              "Server {host} has {lag} seconds of lag (>= {maxlag})",
 +                                              __METHOD__ .
 +                                              ": server {host} has {lag} seconds of lag (>= {maxlag})",
                                                [ 'host' => $host, 'lag' => $lag, 'maxlag' => $maxServerLag ]
                                        );
                                        unset( $loads[$i] );
@@@ -428,8 -426,7 +428,8 @@@
                                }
                                if ( $i === false && count( $currentLoads ) != 0 ) {
                                        // All replica DBs lagged. Switch to read-only mode
 -                                      $this->replLogger->error( "All replica DBs lagged. Switch to read-only mode" );
 +                                      $this->replLogger->error(
 +                                              __METHOD__ . ": all replica DBs lagged. Switch to read-only mode" );
                                        $i = ArrayUtils::pickRandom( $currentLoads );
                                        $laggedReplicaMode = true;
                                }
@@@ -467,7 -464,7 +467,7 @@@
  
                // If all servers were down, quit now
                if ( !count( $currentLoads ) ) {
 -                      $this->connLogger->error( "All servers down" );
 +                      $this->connLogger->error( __METHOD__ . ": all servers down" );
                }
  
                return [ $i, $laggedReplicaMode ];
@@@ -630,7 -627,7 +630,7 @@@
  
                $this->replLogger->info(
                        __METHOD__ .
 -                      ': Waiting for replica DB {dbserver} to catch up...',
 +                      ': waiting for replica DB {dbserver} to catch up...',
                        [ 'dbserver' => $server ]
                );
  
@@@ -657,7 -654,7 +657,7 @@@
                        );
                        $ok = false;
                } else {
 -                      $this->replLogger->info( __METHOD__ . ": Done" );
 +                      $this->replLogger->debug( __METHOD__ . ": done waiting" );
                        $ok = true;
                        // Remember that the DB reached this point
                        $this->srvCache->set( $key, $this->waitForPos, BagOStuff::TTL_DAY );
@@@ -739,7 -736,7 +739,7 @@@
                return $conn;
        }
  
-       public function reuseConnection( $conn ) {
+       public function reuseConnection( IDatabase $conn ) {
                $serverIndex = $conn->getLBInfo( 'serverIndex' );
                $refCount = $conn->getLBInfo( 'foreignPoolRefCount' );
                if ( $serverIndex === null || $refCount === null ) {
@@@ -757,8 -754,7 +757,8 @@@
                } elseif ( $conn instanceof DBConnRef ) {
                        // DBConnRef already handles calling reuseConnection() and only passes the live
                        // Database instance to this method. Any caller passing in a DBConnRef is broken.
 -                      $this->connLogger->error( __METHOD__ . ": got DBConnRef instance.\n" .
 +                      $this->connLogger->error(
 +                              __METHOD__ . ": got DBConnRef instance.\n" .
                                ( new RuntimeException() )->getTraceAsString() );
  
                        return;
@@@ -859,12 -855,10 +859,12 @@@
                                $conn = $this->reallyOpenConnection( $server, $this->localDomain );
                                $host = $this->getServerName( $i );
                                if ( $conn->isOpen() ) {
 -                                      $this->connLogger->debug( "Connected to database $i at '$host'." );
 +                                      $this->connLogger->debug(
 +                                              __METHOD__ . ": connected to database $i at '$host'." );
                                        $this->conns[$connKey][$i][0] = $conn;
                                } else {
 -                                      $this->connLogger->warning( "Failed to connect to database $i at '$host'." );
 +                                      $this->connLogger->warning(
 +                                              __METHOD__ . ": failed to connect to database $i at '$host'." );
                                        $this->errorConnection = $conn;
                                        $conn = false;
                                }
@@@ -1091,7 -1085,7 +1091,7 @@@
                if ( $conn instanceof IDatabase ) {
                        $context['db_server'] = $conn->getServer();
                        $this->connLogger->warning(
 -                              "Connection error: {last_error} ({db_server})",
 +                              __METHOD__ . ": connection error: {last_error} ({db_server})",
                                $context
                        );
  
@@@ -1100,8 -1094,7 +1100,8 @@@
                } else {
                        // No last connection, probably due to all servers being too busy
                        $this->connLogger->error(
 -                              "LB failure with no last connection. Connection error: {last_error}",
 +                              __METHOD__ .
 +                              ": LB failure with no last connection. Connection error: {last_error}",
                                $context
                        );
  
@@@ -1169,8 -1162,7 +1169,8 @@@
        public function closeAll() {
                $this->forEachOpenConnection( function ( IDatabase $conn ) {
                        $host = $conn->getServer();
 -                      $this->connLogger->debug( "Closing connection to database '$host'." );
 +                      $this->connLogger->debug(
 +                              __METHOD__ . ": closing connection to database '$host'." );
                        $conn->close();
                } );
  
@@@ -1195,8 -1187,7 +1195,8 @@@
                        foreach ( $connsByServer[$serverIndex] as $i => $trackedConn ) {
                                if ( $conn === $trackedConn ) {
                                        $host = $this->getServerName( $i );
 -                                      $this->connLogger->debug( "Closing connection to database $i at '$host'." );
 +                                      $this->connLogger->debug(
 +                                              __METHOD__ . ": closing connection to database $i at '$host'." );
                                        unset( $this->conns[$type][$serverIndex][$i] );
                                        --$this->connsOpened;
                                        break 2;
@@@ -1692,7 -1683,7 +1692,7 @@@
                if ( $pos instanceof DBMasterPos ) {
                        $result = $conn->masterPosWait( $pos, $timeout );
                        if ( $result == -1 || is_null( $result ) ) {
 -                              $msg = __METHOD__ . ': Timed out waiting on {host} pos {pos}';
 +                              $msg = __METHOD__ . ': timed out waiting on {host} pos {pos}';
                                $this->replLogger->warning( $msg, [
                                        'host' => $conn->getServer(),
                                        'pos' => $pos,
@@@ -1700,7 -1691,7 +1700,7 @@@
                                ] );
                                $ok = false;
                        } else {
 -                              $this->replLogger->info( __METHOD__ . ': Done' );
 +                              $this->replLogger->debug( __METHOD__ . ': done waiting' );
                                $ok = true;
                        }
                } else {