$lockKey = wfWikiID() . ':recentchanges-prune';
$dbw = wfGetDB( DB_MASTER );
- if ( !$dbw->lock( $lockKey, __METHOD__, 1 ) ) {
+ if ( !$dbw->lockIsFree( $lockKey, __METHOD__ )
+ || !$dbw->lock( $lockKey, __METHOD__, 1 )
+ ) {
return; // already in progress
}
- $batchSize = 100; // Avoid slave lag
+ $batchSize = 100; // avoid slave lag
$cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
do {
$rcIds = $dbw->selectFieldValues( 'recentchanges',
if ( count( $rcIds ) === $batchSize ) {
// There might be more, so try waiting for slaves
- if ( !wfWaitForSlaves( null, false, false, /* $timeout = */ 3 ) ) {
+ try {
+ wfGetLBFactory()->waitForReplication( array( 'timeout' => 3 ) );
+ } catch ( DBReplicationWaitError $e ) {
// Another job will continue anyway
break;
}
$lockKey = wfWikiID() . '-activeusers';
if ( !$dbw->lock( $lockKey, __METHOD__, 1 ) ) {
- return false; // exclusive update (avoids duplicate entries)
+ return; // exclusive update (avoids duplicate entries)
}
$nowUnix = time();
}
foreach ( array_chunk( $newRows, 500 ) as $rowBatch ) {
$dbw->insert( 'querycachetwo', $rowBatch, __METHOD__ );
- wfWaitForSlaves();
+ wfGetLBFactory()->waitForReplication();
}
}