Merge "Create JobQueueEnqueueUpdate class to call JobQueueGroup::pushLazyJobs()"

diff --combined autoload.php
index 6ccfc86,6261f1a..6df039c
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -706,6 -706,7 +706,7 @@@ $wgAutoloadLocalClasses = 
        'JobQueueAggregatorRedis' => __DIR__ . '/includes/jobqueue/aggregator/JobQueueAggregatorRedis.php',
        'JobQueueConnectionError' => __DIR__ . '/includes/jobqueue/JobQueue.php',
        'JobQueueDB' => __DIR__ . '/includes/jobqueue/JobQueueDB.php',
+       'JobQueueEnqueueUpdate' => __DIR__ . '/includes/deferred/JobQueueEnqueueUpdate.php',
        'JobQueueError' => __DIR__ . '/includes/jobqueue/JobQueue.php',
        'JobQueueFederated' => __DIR__ . '/includes/jobqueue/JobQueueFederated.php',
        'JobQueueGroup' => __DIR__ . '/includes/jobqueue/JobQueueGroup.php',
@@@ -1543,7 -1544,6 +1544,7 @@@
        'UserBlockedError' => __DIR__ . '/includes/exception/UserBlockedError.php',
        'UserCache' => __DIR__ . '/includes/cache/UserCache.php',
        'UserDupes' => __DIR__ . '/maintenance/userDupes.inc',
 +      'UserEditCountUpdate' => __DIR__ . '/includes/deferred/UserEditCountUpdate.php',
        'UserGroupExpiryJob' => __DIR__ . '/includes/jobqueue/jobs/UserGroupExpiryJob.php',
        'UserGroupMembership' => __DIR__ . '/includes/user/UserGroupMembership.php',
        'UserMailer' => __DIR__ . '/includes/mail/UserMailer.php',

diff --combined includes/MediaWiki.php
index 00caca9,4b84fbd..35a8c90
--- 1/includes/MediaWiki.php
--- 2/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@@ -43,7 -43,7 +43,7 @@@ class MediaWiki 
        private $config;
  
        /**
 -       * @var String Cache what action this request is
 +       * @var string Cache what action this request is
         */
        private $action;
  
@@@ -704,12 -704,11 +704,12 @@@
         * @since 1.26
         */
        public function doPostOutputShutdown( $mode = 'normal' ) {
 +              // Record backend request timing
 +              $timing = $this->context->getTiming();
 +              $timing->mark( 'requestShutdown' );
 +
                // Perform the last synchronous operations...
                try {
 -                      // Record backend request timing
 -                      $timing = $this->context->getTiming();
 -                      $timing->mark( 'requestShutdown' );
                        // Show visible profiling data if enabled (which cannot be post-send)
                        Profiler::instance()->logDataPageOutputOnly();
                } catch ( Exception $e ) {
@@@ -900,9 -899,6 +900,6 @@@
                        __METHOD__
                );
  
-               // Important: this must be the last deferred update added (T100085, T154425)
-               DeferredUpdates::addCallableUpdate( [ JobQueueGroup::class, 'pushLazyJobs' ] );
- 
                // Do any deferred jobs; preferring to run them now if a client will not wait on them
                DeferredUpdates::doUpdates( $blocksHttpClient ? 'enqueue' : 'run' );
  

diff --combined includes/jobqueue/JobQueueGroup.php
index c05feb4,06646a5..040ed4b
--- 1/includes/jobqueue/JobQueueGroup.php
--- 2/includes/jobqueue/JobQueueGroup.php
+++ b/includes/jobqueue/JobQueueGroup.php
@@@ -43,9 -43,6 +43,6 @@@ class JobQueueGroup 
        /** @var array Map of (bucket => (queue => JobQueue, types => list of types) */
        protected $coalescedQueues;
  
-       /** @var Job[] */
-       protected $bufferedJobs = [];
- 
        const TYPE_DEFAULT = 1; // integer; jobs popped by default
        const TYPE_ANY = 2; // integer; any job
  
@@@ -105,7 -102,11 +102,7 @@@
                global $wgJobTypeConf;
  
                $conf = [ 'wiki' => $this->wiki, 'type' => $type ];
 -              if ( isset( $wgJobTypeConf[$type] ) ) {
 -                      $conf = $conf + $wgJobTypeConf[$type];
 -              } else {
 -                      $conf = $conf + $wgJobTypeConf['default'];
 -              }
 +              $conf += $wgJobTypeConf[$type] ?? $wgJobTypeConf['default'];
                $conf['aggregator'] = JobQueueAggregator::singleton();
                if ( !isset( $conf['readOnlyReason'] ) ) {
                        $conf['readOnlyReason'] = $this->readOnlyReason;
@@@ -199,7 -200,7 +196,7 @@@
                // Throw errors now instead of on push(), when other jobs may be buffered
                $this->assertValidJobs( $jobs );
  
-               $this->bufferedJobs = array_merge( $this->bufferedJobs, $jobs );
+               DeferredUpdates::addUpdate( new JobQueueEnqueueUpdate( $this->wiki, $jobs ) );
        }
  
        /**
@@@ -207,17 -208,10 +204,10 @@@
         *
         * @return void
         * @since 1.26
+        * @deprecated Since 1.33 Not needed anymore
         */
        public static function pushLazyJobs() {
-               foreach ( self::$instances as $group ) {
-                       try {
-                               $group->push( $group->bufferedJobs );
-                               $group->bufferedJobs = [];
-                       } catch ( Exception $e ) {
-                               // Get in as many jobs as possible and let other post-send updates happen
-                               MWExceptionHandler::logException( $e );
-                       }
-               }
+               wfDeprecated( __METHOD__, '1.33' );
        }
  
        /**
@@@ -460,12 -454,4 +450,4 @@@
                        }
                }
        }
- 
-       function __destruct() {
-               $n = count( $this->bufferedJobs );
-               if ( $n > 0 ) {
-                       $type = implode( ', ', array_unique( array_map( 'get_class', $this->bufferedJobs ) ) );
-                       trigger_error( __METHOD__ . ": $n buffered job(s) of type(s) $type never inserted." );
-               }
-       }
  }