Changeset 25828 for trunk/src/wp-admin/includes/class-wp-upgrader.php

Timestamp:

10/17/2013 05:23:35 AM (12 years ago)

Author:

dd32

Message:

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

File:

• trunk/src/wp-admin/includes/class-wp-upgrader.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -1737 +1737 @@
      */
     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;
-        }
-        // Lock upgrades for us for half an hour
-        if ( ! add_site_option( $lock_name, microtime( true ), HOUR_IN_SECONDS / 2 ) )
-            return;
+
+            // Check to see if the lock is still valid
+            if ( $lock_result > ( time() - HOUR_IN_SECONDS ) )
+                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
@@ -1830 +1843 @@
 
         // Clear the lock
-        delete_site_option( $lock_name );
-
+        delete_option( $lock_name );
     }