Merge "Allow passing the default DB group to use in Maintenance scripts"

diff --combined includes/DefaultSettings.php
index 70c4d01,b032f2b..2c98283
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -1894,6 -1894,11 +1894,11 @@@ $wgSQLMode = ''
   */
  $wgDBmwschema = null;
  
+ /**
+  * Default group to use when getting database connections.
+  */
+ $wgDBDefaultGroup = null;
+ 
  /**
   * To override default SQLite data directory ($docroot/../data)
   */
@@@ -4731,10 -4736,10 +4736,10 @@@ $wgPasswordDefault = 'pbkdf2'
   * $wgPasswordConfig['bcrypt-peppered'] = [
   *     'class' => EncryptedPassword::class,
   *     'underlying' => 'bcrypt',
 - *     'secrets' => [],
 - *     'cipher' => MCRYPT_RIJNDAEL_256,
 - *     'mode' => MCRYPT_MODE_CBC,
 - *     'cost' => 5,
 + *     'secrets' => [
 + *         hash( 'sha256', 'secret', true ),
 + *     ],
 + *     'cipher' => 'aes-256-cbc',
   * ];
   * @endcode
   *
@@@ -8892,17 -8897,6 +8897,17 @@@ $wgInterwikiPrefixDisplayTypes = []
   * @var int One of the MIGRATION_* constants
   */
  $wgCommentTableSchemaMigrationStage = MIGRATION_OLD;
 +
 +/**
 + * RevisionStore table schema migration stage (content, slots, content_models & slot_roles tables)
 + *
 + * @see Task: https://phabricator.wikimedia.org/T174028
 + * @see Commit: https://gerrit.wikimedia.org/r/#/c/378724/
 + *
 + * @since 1.32
 + * @var int One of the MIGRATION_* constants
 + */
 +$wgMultiContentRevisionSchemaMigrationStage = MIGRATION_OLD;
  
  /**
   * Actor table schema migration stage.

diff --combined includes/libs/rdbms/lbfactory/LBFactory.php
index ff296c4,b226f0e..9a30383
--- 1/includes/libs/rdbms/lbfactory/LBFactory.php
--- 2/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@@ -91,6 -91,9 +91,9 @@@ abstract class LBFactory implements ILB
        /** @var string One of the ROUND_* class constants */
        private $trxRoundStage = self::ROUND_CURSORY;
  
+       /** @var string|null */
+       private $defaultGroup = null;
+ 
        const ROUND_CURSORY = 'cursory';
        const ROUND_BEGINNING = 'within-begin';
        const ROUND_COMMITTING = 'within-commit';
@@@ -138,6 -141,7 +141,7 @@@
                $this->cliMode = $conf['cliMode'] ?? ( PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg' );
                $this->hostname = $conf['hostname'] ?? gethostname();
                $this->agent = $conf['agent'] ?? '';
+               $this->defaultGroup = $conf['defaultGroup'] ?? null;
  
                $this->ticket = mt_rand();
        }
@@@ -505,10 -509,6 +509,10 @@@
                        // Request opted out of using position wait logic. This is useful for requests
                        // done by the job queue or background ETL that do not have a meaningful session.
                        $this->chronProt->setWaitEnabled( false );
 +              } elseif ( $this->memStash instanceof EmptyBagOStuff ) {
 +                      // No where to store any DB positions and wait for them to appear
 +                      $this->chronProt->setEnabled( false );
 +                      $this->replLogger->info( 'Cannot use ChronologyProtector with EmptyBagOStuff.' );
                }
  
                $this->replLogger->debug( __METHOD__ . ': using request info ' .
@@@ -579,6 -579,7 +583,7 @@@
                        'hostname' => $this->hostname,
                        'cliMode' => $this->cliMode,
                        'agent' => $this->agent,
+                       'defaultGroup' => $this->defaultGroup,
                        'chronologyCallback' => function ( ILoadBalancer $lb ) {
                                // Defer ChronologyProtector construction in case setRequestInfo() ends up
                                // being called later (but before the first connection attempt) (T192611)
@@@ -654,14 -655,14 +659,14 @@@
  
        /**
         * @param string $value Possible result of LBFactory::makeCookieValueFromCPIndex()
 -       * @param int $minTimestamp Lowest UNIX timestamp of non-expired values (if present)
 +       * @param int $minTimestamp Lowest UNIX timestamp that a non-expired value can have
         * @return array (index: int or null, clientId: string or null)
         * @since 1.32
         */
        public static function getCPInfoFromCookieValue( $value, $minTimestamp ) {
                static $placeholder = [ 'index' => null, 'clientId' => null ];
  
 -              if ( !preg_match( '/^(\d+)(?:@(\d+))?(?:#([0-9a-f]{32}))?$/', $value, $m ) ) {
 +              if ( !preg_match( '/^(\d+)@(\d+)#([0-9a-f]{32})$/', $value, $m ) ) {
                        return $placeholder; // invalid
                }