From 5c55f5d912e51f73df4ce242d747b2f2ecc2399e Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 22 Feb 2018 10:07:40 -0800 Subject: [PATCH] objectcache: improve TTL reduction warning log entries Add "lag" and "age" parameters for more context Change-Id: Iea029e78d4c0bbec0e4334de4fbe7780b1bea524 --- includes/libs/objectcache/WANObjectCache.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php index bcd95c1c20..17f596d6b8 100644 --- a/includes/libs/objectcache/WANObjectCache.php +++ b/includes/libs/objectcache/WANObjectCache.php @@ -517,18 +517,18 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface { // Case B: any long-running transaction; ignore this set() } elseif ( $age > self::MAX_READ_LAG ) { $this->logger->info( 'Rejected set() for {cachekey} due to snapshot lag.', - [ 'cachekey' => $key ] ); + [ 'cachekey' => $key, 'lag' => $lag, 'age' => $age ] ); return true; // no-op the write for being unsafe // Case C: high replication lag; lower TTL instead of ignoring all set()s } elseif ( $lag === false || $lag > self::MAX_READ_LAG ) { $ttl = $ttl ? min( $ttl, self::TTL_LAGGED ) : self::TTL_LAGGED; $this->logger->warning( 'Lowered set() TTL for {cachekey} due to replication lag.', - [ 'cachekey' => $key ] ); + [ 'cachekey' => $key, 'lag' => $lag, 'age' => $age ] ); // Case D: medium length request with medium replication lag; ignore this set() } else { $this->logger->info( 'Rejected set() for {cachekey} due to high read lag.', - [ 'cachekey' => $key ] ); + [ 'cachekey' => $key, 'lag' => $lag, 'age' => $age ] ); return true; // no-op the write for being unsafe } -- 2.20.1