From ade945b97a51536ccb16291c37af85ac2db87e7f Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sun, 6 Dec 2015 18:20:10 +0000 Subject: [PATCH] Remove obsolete showCacheStats.php and showCacheStats.php These scripts interact with keys that used to be set by ParserCache.php. However this hasn't been the case for a long time now. They use wfIncrStats(), which is configured by $wgStatsdServer. Change-Id: Id6a62aec57801085ed684af9362a96eca0914e92 --- HISTORY | 2 + autoload.php | 2 - docs/memcached.txt | 8 --- maintenance/README | 3 - maintenance/clearCacheStats.php | 60 ----------------- maintenance/showCacheStats.php | 115 -------------------------------- 6 files changed, 2 insertions(+), 188 deletions(-) delete mode 100644 maintenance/clearCacheStats.php delete mode 100644 maintenance/showCacheStats.php diff --git a/HISTORY b/HISTORY index e9de01ab2c..7e72fc78e5 100644 --- a/HISTORY +++ b/HISTORY @@ -243,6 +243,8 @@ changes to languages because of Phabricator reports. * DatabaseBase::errorCount() was removed (unused). * $wgDeferredUpdateList was removed. * DeferredUpdates::addHTMLCacheUpdate() was removed. +* Obsolete maintenance scripts clearCacheStats.php and showCacheStats.php + were removed. The underlying data is sent to StatsD (see $wgStatsdServer). == MediaWiki 1.25 == diff --git a/autoload.php b/autoload.php index 74a0f3f3c9..56e76b193a 100644 --- a/autoload.php +++ b/autoload.php @@ -228,7 +228,6 @@ $wgAutoloadLocalClasses = array( 'CleanupPreferences' => __DIR__ . '/maintenance/cleanupPreferences.php', 'CleanupRemovedModules' => __DIR__ . '/maintenance/cleanupRemovedModules.php', 'CleanupSpam' => __DIR__ . '/maintenance/cleanupSpam.php', - 'ClearCacheStats' => __DIR__ . '/maintenance/clearCacheStats.php', 'ClearInterwikiCache' => __DIR__ . '/maintenance/clearInterwikiCache.php', 'CliInstaller' => __DIR__ . '/includes/installer/CliInstaller.php', 'CloneDatabase' => __DIR__ . '/includes/db/CloneDatabase.php', @@ -1105,7 +1104,6 @@ $wgAutoloadLocalClasses = array( 'SevenZipStream' => __DIR__ . '/maintenance/7zip.inc', 'ShiConverter' => __DIR__ . '/languages/classes/LanguageShi.php', 'ShortPagesPage' => __DIR__ . '/includes/specials/SpecialShortpages.php', - 'ShowCacheStats' => __DIR__ . '/maintenance/showCacheStats.php', 'ShowJobs' => __DIR__ . '/maintenance/showJobs.php', 'ShowSiteStats' => __DIR__ . '/maintenance/showSiteStats.php', 'Site' => __DIR__ . '/includes/site/Site.php', diff --git a/docs/memcached.txt b/docs/memcached.txt index ad2307fda0..55fa725971 100644 --- a/docs/memcached.txt +++ b/docs/memcached.txt @@ -232,14 +232,6 @@ Special:Recentchanges (feed): Special:Recentchanges?action=purge&feed=atom, but note need $wgGroupPermissions[...]['purge'] permission. -Statistics: - controlled by: $wgStatsMethod - key: $wgDBname:stats:$key - ex: wikibd:stats:request_with_session - stores: counter for statistics (see maintenance/showCacheStats.php script) - expiry: none (?) - cleared by: maintenance/clearCacheStats.php script - User: key: $wgDBname:user:id:$sId ex: wikidb:user:id:51 diff --git a/maintenance/README b/maintenance/README index 30bb6adb3b..8d0b1c45d6 100644 --- a/maintenance/README +++ b/maintenance/README @@ -90,9 +90,6 @@ installations. runJobs.php Immediately complete all jobs in the job queue - showCacheStats.php - Show all statistics stored in the cache - undelete.php Undelete all revisions of a page diff --git a/maintenance/clearCacheStats.php b/maintenance/clearCacheStats.php deleted file mode 100644 index 6a96612154..0000000000 --- a/maintenance/clearCacheStats.php +++ /dev/null @@ -1,60 +0,0 @@ -mDescription = "Remove all statistics tracking from the cache"; - } - - public function execute() { - global $wgLocalDatabases, $wgMemc; - foreach ( $wgLocalDatabases as $db ) { - $wgMemc->delete( "$db:stats:request_with_session" ); - $wgMemc->delete( "$db:stats:request_without_session" ); - $wgMemc->delete( "$db:stats:pcache_hit" ); - $wgMemc->delete( "$db:stats:pcache_miss_expired" ); - $wgMemc->delete( "$db:stats:pcache_miss_absent" ); - $wgMemc->delete( "$db:stats:pcache_miss_stub" ); - $wgMemc->delete( "$db:stats:image_cache_hit" ); - $wgMemc->delete( "$db:stats:image_cache_miss" ); - $wgMemc->delete( "$db:stats:image_cache_update" ); - $wgMemc->delete( "$db:stats:diff_cache_hit" ); - $wgMemc->delete( "$db:stats:diff_cache_miss" ); - $wgMemc->delete( "$db:stats:diff_uncacheable" ); - $wgMemc->delete( "$db:stats:job-insert" ); - $wgMemc->delete( "$db:stats:job-pop" ); - } - } -} - -$maintClass = "ClearCacheStats"; -require_once RUN_MAINTENANCE_IF_MAIN; diff --git a/maintenance/showCacheStats.php b/maintenance/showCacheStats.php deleted file mode 100644 index 3d16af141d..0000000000 --- a/maintenance/showCacheStats.php +++ /dev/null @@ -1,115 +0,0 @@ -mDescription = "Show statistics from the cache"; - parent::__construct(); - } - - public function getDbType() { - return Maintenance::DB_NONE; - } - - public function execute() { - global $wgMemc; - - // Can't do stats if - if ( get_class( $wgMemc ) == 'EmptyBagOStuff' ) { - $this->error( "You are running EmptyBagOStuff, I can not provide any statistics.", true ); - } - - $this->output( "\nParser cache\n" ); - $hits = intval( $wgMemc->get( wfMemcKey( 'stats', 'pcache_hit' ) ) ); - $expired = intval( $wgMemc->get( wfMemcKey( 'stats', 'pcache_miss_expired' ) ) ); - $absent = intval( $wgMemc->get( wfMemcKey( 'stats', 'pcache_miss_absent' ) ) ); - $stub = intval( $wgMemc->get( wfMemcKey( 'stats', 'pcache_miss_stub' ) ) ); - $total = $hits + $expired + $absent + $stub; - if ( $total ) { - $this->output( sprintf( "hits: %-10d %6.2f%%\n", $hits, $hits / $total * 100 ) ); - $this->output( sprintf( - "expired: %-10d %6.2f%%\n", - $expired, - $expired / $total * 100 - ) ); - $this->output( sprintf( - "absent: %-10d %6.2f%%\n", - $absent, - $absent / $total * 100 - ) ); - $this->output( sprintf( "stub threshold: %-10d %6.2f%%\n", $stub, $stub / $total * 100 ) ); - $this->output( sprintf( "total: %-10d %6.2f%%\n", $total, 100 ) ); - } else { - $this->output( "no statistics available\n" ); - } - - $this->output( "\nImage cache\n" ); - $hits = intval( $wgMemc->get( wfMemcKey( 'stats', 'image_cache_hit' ) ) ); - $misses = intval( $wgMemc->get( wfMemcKey( 'stats', 'image_cache_miss' ) ) ); - $updates = intval( $wgMemc->get( wfMemcKey( 'stats', 'image_cache_update' ) ) ); - $total = $hits + $misses; - if ( $total ) { - $this->output( sprintf( "hits: %-10d %6.2f%%\n", $hits, $hits / $total * 100 ) ); - $this->output( sprintf( - "misses: %-10d %6.2f%%\n", - $misses, - $misses / $total * 100 - ) ); - $this->output( sprintf( "updates: %-10d\n", $updates ) ); - } else { - $this->output( "no statistics available\n" ); - } - - $this->output( "\nDiff cache\n" ); - $hits = intval( $wgMemc->get( wfMemcKey( 'stats', 'diff_cache_hit' ) ) ); - $misses = intval( $wgMemc->get( wfMemcKey( 'stats', 'diff_cache_miss' ) ) ); - $uncacheable = intval( $wgMemc->get( wfMemcKey( 'stats', 'diff_uncacheable' ) ) ); - $total = $hits + $misses + $uncacheable; - if ( $total ) { - $this->output( sprintf( "hits: %-10d %6.2f%%\n", $hits, $hits / $total * 100 ) ); - $this->output( sprintf( - "misses: %-10d %6.2f%%\n", - $misses, - $misses / $total * 100 - ) ); - $this->output( sprintf( - "uncacheable: %-10d %6.2f%%\n", - $uncacheable, - $uncacheable / $total * 100 - ) ); - } else { - $this->output( "no statistics available\n" ); - } - } -} - -$maintClass = "ShowCacheStats"; -require_once RUN_MAINTENANCE_IF_MAIN; -- 2.20.1