private function desyncFixPage( $pageID ) {
# Check for a corrupted page_latest
$dbw = wfGetDB( DB_MASTER );
- $dbw->begin();
+ $dbw->begin( __METHOD__ );
$realLatest = $dbw->selectField( 'page', 'page_latest', array( 'page_id' => $pageID ),
__METHOD__, 'FOR UPDATE' );
# list( $masterFile, $masterPos ) = $dbw->getMasterPos();
/*
if ( !$db->masterPosWait( $masterFile, $masterPos, 10 ) ) {
$this->output( "Slave is too lagged, aborting\n" );
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
sleep(10);
return;
}*/
}
if ( !$found ) {
$this->output( "page_id $pageID seems fine\n" );
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
return;
}
$masterIDs[] = $row->rev_id;
}
- $res = $db->select( 'revision', array( 'rev_id' ), array( 'rev_page' => $pageID ), __METHOD__ );
+ $res = $dbw->select( 'revision', array( 'rev_id' ), array( 'rev_page' => $pageID ), __METHOD__ );
$slaveIDs = array();
foreach ( $res as $row ) {
$slaveIDs[] = $row->rev_id;
$missingIDs = array_diff( $slaveIDs, $masterIDs );
if ( count( $missingIDs ) ) {
$this->output( "Found " . count( $missingIDs ) . " lost in master, copying from slave... " );
- $dbFrom = $db;
+ $dbFrom = $dbw;
$found = true;
$toMaster = true;
} else {
}
$this->output( "done\n" );
}
- $dbw->commit();
+ $dbw->commit( __METHOD__ );
}
}
$maintClass = "FixSlaveDesync";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );