wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-12 00:38:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate the per-filter deferred profiling updates into one deferred update

Browse source 
This makes debug logs easier to follow without all of the update spam

Change-Id: I6fb0b3b16a05e35b086edc0a50e20c5265ee2a3a
This commit is contained in:
Aaron Schulz 2021-01-27 15:10:38 -08:00
parent f81a111ae9
commit dddfcd6f0f
1 changed files with 45 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
includes/FilterProfiler.php
View file

@ -130,31 +130,28 @@ class FilterProfiler {
* @param bool $matched
*/
private function recordProfilingResult( int $filter, float $time, int $conds, bool $matched ) : void {
// Defer updates to avoid massive (~1 second) edit time increases
DeferredUpdates::addCallableUpdate( function () use ( $filter, $time, $conds, $matched ) {
// Note: It is important that all key information be stored together in a single
// memcache entry to avoid race conditions where competing Apache instances
// partially overwrite the stats.
$profileKey = $this->filterProfileKey( $filter );
$this->objectStash->merge(
$profileKey,
function ( $cache, $key, $profile ) use ( $time, $conds, $matched ) {
if ( $profile === false ) {
$profile = self::NULL_FILTER_PROFILE;
}
// Note: It is important that all key information be stored together in a single
// memcache entry to avoid race conditions where competing Apache instances
// partially overwrite the stats.
$profileKey = $this->filterProfileKey( $filter );
$this->objectStash->merge(
$profileKey,
function ( $cache, $key, $profile ) use ( $time, $conds, $matched ) {
if ( $profile === false ) {
$profile = self::NULL_FILTER_PROFILE;
}
$profile['count']++;
if ( $matched ) {
$profile['matches']++;
}
$profile['total-time'] += $time;
$profile['total-cond'] += $conds;
$profile['count']++;
if ( $matched ) {
$profile['matches']++;
}
$profile['total-time'] += $time;
$profile['total-cond'] += $conds;
return $profile;
},
BagOStuff::TTL_HOUR
);
} );
return $profile;
},
BagOStuff::TTL_HOUR
);
}
/**
@ -245,30 +242,35 @@ class FilterProfiler {
* @phan-param array<string,array{time:float,conds:int,result:bool}> $data
*/
public function recordPerFilterProfiling( Title $title, array $data ) : void {
foreach ( $data as $filterName => $params ) {
list( $filterID, $global ) = GlobalNameUtils::splitGlobalName( $filterName );
if ( !$global ) {
// Defer profiling updates to avoid massive (~1 second) edit time increases
DeferredUpdates::addCallableUpdate( function () use ( $title, $data ) {
$slowFilterThreshold = $this->options->get( 'AbuseFilterSlowFilterRuntimeLimit' );
foreach ( $data as $filterName => $params ) {
list( $filterID, $global ) = GlobalNameUtils::splitGlobalName( $filterName );
// @todo Maybe add a parameter to recordProfilingResult to record global filters
// data separately (in the foreign wiki)
$this->recordProfilingResult(
$filterID,
$params['time'],
$params['conds'],
$params['result']
);
}
if ( !$global ) {
$this->recordProfilingResult(
$filterID,
$params['time'],
$params['conds'],
$params['result']
);
}
if ( $params['time'] > $this->options->get( 'AbuseFilterSlowFilterRuntimeLimit' ) ) {
$this->recordSlowFilter(
$title,
$filterName,
$params['time'],
$params['conds'],
$params['result'],
$global
);
if ( $params['time'] > $slowFilterThreshold ) {
$this->recordSlowFilter(
$title,
$filterName,
$params['time'],
$params['conds'],
$params['result'],
$global
);
}
}
}
} );
}
/**