Merge "Added $wgJobBackoffThrottling to replace wmf sleep() hack"

diff --combined includes/DefaultSettings.php
index 690bec2,e705ab4..0f7707c
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -3344,7 -3344,6 +3344,7 @@@ $wgResourceLoaderLESSFunctions = array
   */
  $wgResourceLoaderLESSImportPaths = array(
        "$IP/resources/mediawiki.less/",
 +      "$IP/skins/vector/",
  );
  
  /**
@@@ -5934,16 -5933,6 +5934,16 @@@ $wgExtensionFunctions = array()
   * Variables defined in extensions will override conflicting variables defined
   * in the core.
   *
 + * Since MediaWiki 1.23, use of this variable to define messages is discouraged; instead, store
 + * messages in JSON format and use $wgMessagesDirs. For setting other variables than
 + * $messages, $wgExtensionMessagesFiles should still be used.
 + *
 + * If there is an entry in $wgMessagesDirs with the same key as one in
 + * $wgExtensionMessagesFiles, then any $messages variables set in the $wgExtensionMessagesFiles file
 + * will be ignored. This means an extension that only provides messages can be backwards compatible
 + * by using both $wgExtensionMessagesFiles and $wgMessagesDirs, and only one of the two
 + * will be used depending on what the version of MediaWiki supports.
 + *
   * @par Example:
   * @code
   *    $wgExtensionMessagesFiles['ConfirmEdit'] = __DIR__.'/ConfirmEdit.i18n.php';
@@@ -5951,32 -5940,6 +5951,32 @@@
   */
  $wgExtensionMessagesFiles = array();
  
 +/**
 + * Extension messages directories.
 + *
 + * Associative array mapping extension name to the path of the directory where message files can
 + * be found. The message files are expected to be JSON files named for their language code, e.g.
 + * en.json, de.json, etc. Extensions with messages in multiple places may specify an array of
 + * message directories.
 + *
 + * @par Simple example:
 + * @code
 + *    $wgMessagesDirs['ConfirmEdit'] = __DIR__ . '/i18n';
 + * @endcode
 + *
 + * @par Complex example:
 + * @code
 + *    $wgMessagesDirs['VisualEditor'] = array(
 + *        __DIR__ . '/i18n',
 + *        __DIR__ . '/modules/ve-core/i18n',
 + *        __DIR__ . '/modules/qunit/localisation',
 + *        __DIR__ . '/modules/oojs-ui/messages',
 + *    )
 + * @endcode
 + * @since 1.23
 + */
 +$wgMessagesDirs = array();
 +
  /**
   * Array of files with list(s) of extension entry points to be used in
   * maintenance/mergeMessageFileList.php
@@@ -6130,9 -6093,19 +6130,19 @@@ $wgJobClasses = array
   * - Jobs that you would never want to run as part of a page rendering request.
   * - Jobs that you want to run on specialized machines ( like transcoding, or a particular
   *   machine on your cluster has 'outside' web access you could restrict uploadFromUrl )
+  * These settings should be global to all wikis.
   */
  $wgJobTypesExcludedFromDefaultQueue = array( 'AssembleUploadChunks', 'PublishStashedFile' );
  
+ /**
+  * Map of job types to how many job "work items" should be run per second
+  * on each job runner process. The meaning of "work items" varies per job,
+  * but typically would be something like "pages to update". A single job
+  * may have a variable number of work items, as is the case with batch jobs.
+  * These settings should be global to all wikis.
+  */
+ $wgJobBackoffThrottling = array();
+ 
  /**
   * Map of job types to configuration arrays.
   * This determines which queue class and storage system is used for each job type.