Merge "rdbms: make LBFactory "cliMode" check for phpdbg"

diff --combined includes/libs/rdbms/lbfactory/LBFactory.php
index b1ea810,64b54e4..19b8fdc
--- 1/includes/libs/rdbms/lbfactory/LBFactory.php
--- 2/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@@ -52,8 -52,6 +52,8 @@@ abstract class LBFactory implements ILB
        protected $perfLogger;
        /** @var callable Error logger */
        protected $errorLogger;
 +      /** @var callable Deprecation logger */
 +      protected $deprecationLogger;
        /** @var BagOStuff */
        protected $srvCache;
        /** @var BagOStuff */
@@@ -111,12 -109,7 +111,12 @@@
                $this->errorLogger = isset( $conf['errorLogger'] )
                        ? $conf['errorLogger']
                        : function ( Exception $e ) {
 -                              trigger_error( E_USER_WARNING, get_class( $e ) . ': ' . $e->getMessage() );
 +                              trigger_error( get_class( $e ) . ': ' . $e->getMessage(), E_USER_WARNING );
 +                      };
 +              $this->deprecationLogger = isset( $conf['deprecationLogger'] )
 +                      ? $conf['deprecationLogger']
 +                      : function ( $msg ) {
 +                              trigger_error( $msg, E_USER_DEPRECATED );
                        };
  
                $this->profiler = isset( $conf['profiler'] ) ? $conf['profiler'] : null;
@@@ -131,7 -124,9 +131,9 @@@
                        'ChronologyPositionIndex' => isset( $_GET['cpPosIndex'] ) ? $_GET['cpPosIndex'] : null
                ];
  
-               $this->cliMode = isset( $conf['cliMode'] ) ? $conf['cliMode'] : PHP_SAPI === 'cli';
+               $this->cliMode = isset( $conf['cliMode'] )
+                       ? $conf['cliMode']
+                       : ( PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg' );
                $this->hostname = isset( $conf['hostname'] ) ? $conf['hostname'] : gethostname();
                $this->agent = isset( $conf['agent'] ) ? $conf['agent'] : '';
  
@@@ -521,7 -516,6 +523,7 @@@
                        'connLogger' => $this->connLogger,
                        'replLogger' => $this->replLogger,
                        'errorLogger' => $this->errorLogger,
 +                      'deprecationLogger' => $this->deprecationLogger,
                        'hostname' => $this->hostname,
                        'cliMode' => $this->cliMode,
                        'agent' => $this->agent,

diff --combined includes/libs/rdbms/loadbalancer/LoadBalancer.php
index db2ab1f,750df0f..94acc1e
--- 1/includes/libs/rdbms/loadbalancer/LoadBalancer.php
--- 2/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@@ -111,8 -111,6 +111,8 @@@ class LoadBalancer implements ILoadBala
  
        /** @var callable Exception logger */
        private $errorLogger;
 +      /** @var callable Deprecation logger */
 +      private $deprecationLogger;
  
        /** @var bool */
        private $disabled = false;
@@@ -225,11 -223,6 +225,11 @@@
                        : function ( Exception $e ) {
                                trigger_error( get_class( $e ) . ': ' . $e->getMessage(), E_USER_WARNING );
                        };
 +              $this->deprecationLogger = isset( $params['deprecationLogger'] )
 +                      ? $params['deprecationLogger']
 +                      : function ( $msg ) {
 +                              trigger_error( $msg, E_USER_DEPRECATED );
 +                      };
  
                foreach ( [ 'replLogger', 'connLogger', 'queryLogger', 'perfLogger' ] as $key ) {
                        $this->$key = isset( $params[$key] ) ? $params[$key] : new NullLogger();
@@@ -539,7 -532,7 +539,7 @@@
                                if ( $this->loads[$i] > 0 ) {
                                        $start = microtime( true );
                                        $ok = $this->doWait( $i, true, $timeout ) && $ok;
-                                       $timeout -= ( microtime( true ) - $start );
+                                       $timeout -= intval( microtime( true ) - $start );
                                        if ( $timeout <= 0 ) {
                                                break; // timeout reached
                                        }
@@@ -1074,7 -1067,6 +1074,7 @@@
                $server['connLogger'] = $this->connLogger;
                $server['queryLogger'] = $this->queryLogger;
                $server['errorLogger'] = $this->errorLogger;
 +              $server['deprecationLogger'] = $this->deprecationLogger;
                $server['profiler'] = $this->profiler;
                $server['trxProfiler'] = $this->trxProfiler;
                // Use the same agent and PHP mode for all DB handles
@@@ -1431,12 -1423,6 +1431,12 @@@
        }
  
        /**
 +       * Make all DB servers with DBO_DEFAULT/DBO_TRX set join the transaction round
 +       *
 +       * Some servers may have neither flag enabled, meaning that they opt out of such
 +       * transaction rounds and remain in auto-commit mode. Such behavior might be desired
 +       * when a DB server is used for something like simple key/value storage.
 +       *
         * @param IDatabase $conn
         */
        private function applyTransactionRoundFlags( IDatabase $conn ) {
@@@ -1448,10 -1434,9 +1448,10 @@@
                        // DBO_TRX is controlled entirely by CLI mode presence with DBO_DEFAULT.
                        // Force DBO_TRX even in CLI mode since a commit round is expected soon.
                        $conn->setFlag( $conn::DBO_TRX, $conn::REMEMBER_PRIOR );
 -                      // If config has explicitly requested DBO_TRX be either on or off by not
 -                      // setting DBO_DEFAULT, then respect that. Forcing no transactions is useful
 -                      // for things like blob stores (ExternalStore) which want auto-commit mode.
 +              }
 +
 +              if ( $conn->getFlag( $conn::DBO_TRX ) ) {
 +                      $conn->setLBInfo( 'trxRoundId', $this->trxRoundId );
                }
        }
  
@@@ -1463,10 -1448,6 +1463,10 @@@
                        return; // transaction rounds do not apply to these connections
                }
  
 +              if ( $conn->getFlag( $conn::DBO_TRX ) ) {
 +                      $conn->setLBInfo( 'trxRoundId', false );
 +              }
 +
                if ( $conn->getFlag( $conn::DBO_DEFAULT ) ) {
                        $conn->restoreFlags( $conn::RESTORE_PRIOR );
                }