From: jenkins-bot Date: Wed, 28 Oct 2015 15:10:40 +0000 (+0000) Subject: Merge "Make WAN cache HOLDOFF_TTL smaller by combining db/snapshot lag" X-Git-Tag: 1.31.0-rc.0~9192 X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/fiche.php?a=commitdiff_plain;h=33859dfcf5c3eae9dda11d9a7d5d505ee6b32b64;p=lhc%2Fweb%2Fwiklou.git Merge "Make WAN cache HOLDOFF_TTL smaller by combining db/snapshot lag" --- 33859dfcf5c3eae9dda11d9a7d5d505ee6b32b64 diff --cc includes/libs/objectcache/WANObjectCache.php index 6616c0b6a7,d9a8d71a73..5338e3aa0e --- a/includes/libs/objectcache/WANObjectCache.php +++ b/includes/libs/objectcache/WANObjectCache.php @@@ -81,15 -81,13 +81,13 @@@ class WANObjectCache implements IExpiri /** Max time expected to pass between delete() and DB commit finishing */ const MAX_COMMIT_DELAY = 3; - /** Max replication lag before applying TTL_LAGGED to set() */ - const MAX_REPLICA_LAG = 5; - /** Max time since snapshot transaction start to avoid no-op of set() */ - const MAX_SNAPSHOT_LAG = 5; + /** Max replication+snapshot lag before applying TTL_LAGGED or disallowing set() */ + const MAX_READ_LAG = 7; /** Seconds to tombstone keys on delete() */ - const HOLDOFF_TTL = 14; // MAX_COMMIT_DELAY + MAX_REPLICA_LAG + MAX_SNAPSHOT_LAG + 1 + const HOLDOFF_TTL = 11; // MAX_COMMIT_DELAY + MAX_READ_LAG + 1 /** Seconds to keep dependency purge keys around */ - const CHECK_KEY_TTL = 31536000; // 1 year + const CHECK_KEY_TTL = self::TTL_YEAR; /** Seconds to keep lock keys around */ const LOCK_TTL = 5; /** Default remaining TTL at which to consider pre-emptive regeneration */