From c628b6d121b49319e783dd80f7cae4284807634b Mon Sep 17 00:00:00 2001 From: Tyler Anthony Romeo Date: Sun, 10 Feb 2013 22:21:30 -0500 Subject: [PATCH] (bug 42600) (bug 24375) Fix doMaintenance.php exit procedures. Fixed the post-execution calls in doMaintenance.php to perform proper cleanup after the maintenance script runs (modeled after MediaWiki::restInPeace). Added a global call to wfWaitForSlaves() and then wfDoUpdates() in doMaintenance.php to ensure that deferred updates are always performed at the end of maintenance scripts (and that they're performed after the slaves catch up to avoid lag). Also added calls to shutdown the DB factory so that implicit transactions are committed and the connections are closed. Change-Id: I6f9580559d75f4761c5ddb504b2e3380e2e562a3 --- maintenance/doMaintenance.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index f470aedb5c..15b00167d2 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -112,8 +112,16 @@ try { // Potentially debug globals $maintenance->globals(); + // Perform deferred updates. + DeferredUpdates::doUpdates( 'commit' ); + // log profiling info wfLogProfilingData(); + + // Commit and close up! + $factory = wfGetLBFactory(); + $factory->commitMasterChanges(); + $factory->shutdown(); } catch ( MWException $mwe ) { echo( $mwe->getText() ); exit( 1 ); -- 2.20.1