wfRunHooks() -> Hooks::run() in maintenance scripts

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 25f6206..5b7e94a 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2148,11 +2148,13 @@ $wgObjectCaches = array(
  * cache with a relayer of type EventRelayerNull.
  *
  * The options are:
+ *   - false:            Configure the cache using $wgMainCacheType, without using
+ *                       a relayer (only matters if there are multiple data-centers)
  *   - CACHE_NONE:       Do not cache
  *   - (other):          A string may be used which identifies a cache
  *                       configuration in $wgWANObjectCaches.
  */
-$wgMainWANCache = CACHE_NONE;
+$wgMainWANCache = false;
 
 /**
  * Advanced WAN object cache configuration.
@@ -2170,15 +2172,15 @@ $wgMainWANCache = CACHE_NONE;
 $wgWANObjectCaches = array(
        CACHE_NONE => array(
                'class'         => 'WANObjectCache',
-               'pool'          => 'mediawiki-main-none',
                'cacheId'       => CACHE_NONE,
+               'pool'          => 'mediawiki-main-none',
                'relayerConfig' => array( 'class' => 'EventRelayerNull' )
        )
        /* Example of a simple single data-center cache:
        'memcached-php' => array(
                'class'         => 'WANObjectCache',
-               'pool'          => 'mediawiki-main-memcached',
                'cacheId'       => 'memcached-php',
+               'pool'          => 'mediawiki-main-memcached',
                'relayerConfig' => array( 'class' => 'EventRelayerNull' )
        )
        */
@@ -6495,6 +6497,21 @@ $wgJobTypesExcludedFromDefaultQueue = array( 'AssembleUploadChunks', 'PublishSta
  */
 $wgJobBackoffThrottling = array();
 
+/**
+ * Make job runners commit changes for slave-lag prone jobs one job at a time.
+ * This is useful if there are many job workers that race on slave lag checks.
+ * If set, jobs taking this many seconds of DB write time have serialized commits.
+ *
+ * Note that affected jobs may have worse lock contention. Also, if they affect
+ * several DBs at once they may have a smaller chance of being atomic due to the
+ * possibility of connection loss while queueing up to commit. Affected jobs may
+ * also fail due to the commit lock acquisition timeout.
+ *
+ * @var float|bool
+ * @since 1.26
+ */
+$wgJobSerialCommitThreshold = false;
+
 /**
  * Map of job types to configuration arrays.
  * This determines which queue class and storage system is used for each job type.