diff --git a/includes/libs/objectcache/README.md b/includes/libs/objectcache/README.md index d8041748840..064878fbd09 100644 --- a/includes/libs/objectcache/README.md +++ b/includes/libs/objectcache/README.md @@ -14,11 +14,8 @@ statistics in entry points where MW_ENTRY_POINT is 'cli'. Upon cache access via `WANObjectCache::getWithSetCallback()`, this measures the total time spent in this method from start to end for all cases, except process-cache hits. -See also subsets of this measure: - -* `wanobjectcache.{kClass}.regen_walltime`: If regenerated, just the portion of time to regenerate the value. -* `wanobjectcache.{kClass}.regen_set_delay`: If regenerated and approved for storing, the time from start to right - before storing. +See also `wanobjectcache.{kClass}.regen_walltime`, which, during misses/renews, measures just the +portion of time spent in the callback to regenerate the value. * Type: Measure (in milliseconds). * Variable `kClass`: The first part of your cache key. @@ -52,19 +49,6 @@ the regeneration callback when computing a new value. * Type: Measure (in milliseconds). * Variable `kClass`: The first part of your cache key. -#### `wanobjectcache.{kClass}.regen_set_delay` - -Upon cache update due to a cache miss or async refresh, this measures the time spent in -`WANObjectCache::getWithSetCallback()`, from the start of the method to right after -the new value has been computed by the callback. - -This essentially measures the whole method (including retrieval of any old value, -validation, any regeneration locks, and the callback), except for the time spent -in sending the value to the backend store. - -* Type: Measure (in milliseconds). -* Variable `kClass`: The first part of your cache key. - #### `wanobjectcache.{kClass}.ck_touch.{result}` Call counter from `WANObjectCache::touchCheckKey()`. diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php index 4d3b4998ac2..e624022a2ce 100644 --- a/includes/libs/objectcache/WANObjectCache.php +++ b/includes/libs/objectcache/WANObjectCache.php @@ -1811,9 +1811,6 @@ class WANObjectCache implements } $postCallbackTime = $this->getCurrentTime(); - // How long it took to fetch, validate, and generate the value - $elapsed = max( $postCallbackTime - $startTime, 0.0 ); - // How long it took to generate the value $walltime = max( $postCallbackTime - $preCallbackTime, 0.0 ); @@ -1829,11 +1826,6 @@ class WANObjectCache implements // Current thread was not raced out of a regeneration lock or key is tombstoned ( !$useRegenerationLock || $hasLock || $isKeyTombstoned ) ) { - $this->stats->getTiming( 'wanobjectcache_regen_set_delay_seconds' ) - ->setLabel( 'keygroup', $keygroup ) - ->copyToStatsdAt( "wanobjectcache.$keygroup.regen_set_delay" ) - ->observe( 1e3 * $elapsed ); - // If the key is write-holed then use the (volatile) interim key as an alternative if ( $isKeyTombstoned ) { $this->setInterimValue(