return false; // deleted?
}
- // Cut down on the time spent in safeWaitForMasterPos() in the critical section
+ // Cut down on the time spent in waitForMasterPos() in the critical section
$dbr = $lb->getConnection( DB_REPLICA, [ 'recentchanges' ] );
- if ( !$lb->safeWaitForMasterPos( $dbr ) ) {
+ if ( !$lb->waitForMasterPos( $dbr ) ) {
$this->setLastError( "Timed out while pre-waiting for replica DB to catch up" );
return false;
}
// Use a named lock so that jobs for this page see each others' changes
- $lockKey = "CategoryMembershipUpdates:{$page->getId()}";
+ $lockKey = "{$dbw->getDomainID()}:CategoryMembershipChange:{$page->getId()}"; // per-wiki
$scopedLock = $dbw->getScopedLockAndFlush( $lockKey, __METHOD__, 3 );
if ( !$scopedLock ) {
$this->setLastError( "Could not acquire lock '$lockKey'" );
}
// Wait till replica DB is caught up so that jobs for this page see each others' changes
- if ( !$lb->safeWaitForMasterPos( $dbr ) ) {
+ if ( !$lb->waitForMasterPos( $dbr ) ) {
$this->setLastError( "Timed out while waiting for replica DB to catch up" );
return false;
}
// Get the prior revision (the same for null edits)
if ( $newRev->getParentId() ) {
$oldRev = Revision::newFromId( $newRev->getParentId(), Revision::READ_LATEST );
- if ( !$oldRev->getContent() ) {
+ if ( !$oldRev || !$oldRev->getContent() ) {
return; // deleted?
}
} else {