Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove obsolete showCacheStats.php and showCacheStats.php

Browse source 
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
This commit is contained in:
Timo Tijhof 2015-12-06 18:20:10 +00:00
parent 3b35719e74
commit ade945b97a
6 changed files with 2 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HISTORY
View file

@ -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 ==

2
autoload.php
View file

@ -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',

8
docs/memcached.txt
View file

@ -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

3
maintenance/README
View file

@ -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

60
maintenance/clearCacheStats.php
View file

@ -1,60 +0,0 @@
<?php
/**
* Removes all statistics tracking from the cache.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
* @ingroup Maintenance
*/
require_once __DIR__ . '/Maintenance.php';
/**
* Maintenance script to remove all statistics tracking from the cache.
*
* @ingroup Maintenance
*/
class ClearCacheStats extends Maintenance {
public function __construct() {
parent::__construct();
$this->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;

115
maintenance/showCacheStats.php
View file

@ -1,115 +0,0 @@
<?php
/**
* Show statistics from the cache.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* http://www.gnu.org/copyleft/gpl.html
*
* @file
* @ingroup Maintenance
*/
require_once __DIR__ . '/Maintenance.php';
/**
* Maintenance script that shows statistics from the cache.
*
* @ingroup Maintenance
*/
class ShowCacheStats extends Maintenance {
public function __construct() {
$this->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;