WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

For Background updates, ensure that only one update process runs at the same time by using the options table as a lock. 

This prevents multiple cron spawns and/or long-running updates from causing multiple update processes to spin up.
This also fixes a case where the upgrader might kick in for ( ! is_main_network() || ! is_main_site() ) in mulisite installs.
See #22704

Built from https://develop.svn.wordpress.org/trunk@25828


git-svn-id: http://core.svn.wordpress.org/trunk@25740 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2013-10-17 05:24:09 +00:00
parent 8f0f48e3f9
commit 1c8d882e13
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-admin/includes/class-wp-upgrader.php
View File

@ -1736,17 +1736,30 @@ class WP_Automatic_Upgrader {
* Kicks off a upgrade request for each item in the upgrade "queue"
*/
function run() {
global $wpdb;
if ( ! is_main_network() || ! is_main_site() )
return;
$lock_name = 'auto_upgrader.lock';
if ( get_site_option( $lock_name ) ) {
// Test to see if it was set more than an hour ago, if so, cleanup.
if ( get_site_option( $lock_name ) < ( time() - HOUR_IN_SECONDS ) )
delete_site_option( $lock_name );
else // The process is already locked
// Try to lock
$lock_result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'no') /* LOCK */", $lock_name, time() ) );
if ( ! $lock_result ) {
$lock_result = get_option( $lock_name );
// If we couldn't create a lock, and there isn't a lock, bail
if ( ! $lock_result )
return;
// Check to see if the lock is still valid
if ( $lock_result > ( time() - HOUR_IN_SECONDS ) )
return;
}
// Lock upgrades for us for half an hour
if ( ! add_site_option( $lock_name, microtime( true ), HOUR_IN_SECONDS / 2 ) )
return;
// Update the lock, as by this point we've definately got a lock, just need to fire the actions
update_option( $lock_name, time() );
// Don't automatically run these thins, as we'll handle it ourselves
remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
@ -1829,8 +1842,7 @@ class WP_Automatic_Upgrader {
$this->send_debug_email();
// Clear the lock
delete_site_option( $lock_name );
delete_option( $lock_name );
}
function send_debug_email() {