Changeset 58128

Timestamp:

05/10/2024 11:46:51 AM (3 months ago)

Author:

johnbillion

Message:

Upgrade/Install: Automatically roll back to the previous version when an automatic plugin update results in a fatal error on the front end of the site.

This builds on the temporary backup system introduced in 6.3 to allow automatic updates to benefit from fatal error protection. A loopback request is performed to the home page of the site and the plugin is rolled back to its backed up version if a fatal error is observed.

For debugging and observability during beta, this change includes several calls to error_log() during the upgrade and rollback stages. These calls can be removed or placed behind a flag once we're ready for RC1.

Props costdev, johnbillion, mukesh27, afragen, audrasjb, justlevine, kirasong, peterwilsoncc

Fixes #58281

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-automatic-updater.php (modified) (9 diffs)
• wp-admin/includes/class-wp-upgrader.php (modified) (6 diffs)
• wp-includes/load.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-automatic-updater.php

@@ -447 +447 @@
         }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         // Boom, this site's about to get a whole new splash of paint!
         $upgrade_result = $upgrader->upgrade(
@@ -461 +484 @@
         );
 
+
+
+
+
+
+
+
+
+
+
+
         // If the filesystem is unavailable, false is returned.
         if ( false === $upgrade_result ) {
@@ -487 +521 @@
         }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         $this->update_results[ $type ][] = (object) array(
             'item'     => $item,
@@ -515 +635 @@
         }
 
+
+
         // Don't automatically run these things, as we'll handle it ourselves.
         remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
@@ -525 +647 @@
         $plugin_updates = get_site_transient( 'update_plugins' );
         if ( $plugin_updates && ! empty( $plugin_updates->response ) ) {
+
+
             foreach ( $plugin_updates->response as $plugin ) {
                 $this->update( 'plugin', $plugin );
             }
+
             // Force refresh of plugin update information.
             wp_clean_plugins_cache();
+
+
         }
 
@@ -536 +663 @@
         $theme_updates = get_site_transient( 'update_themes' );
         if ( $theme_updates && ! empty( $theme_updates->response ) ) {
+
+
             foreach ( $theme_updates->response as $theme ) {
                 $this->update( 'theme', (object) $theme );
@@ -541 +670 @@
             // Force refresh of theme update information.
             wp_clean_themes_cache();
-        }
+
+            error_log( '  Automatic theme updates complete.' );
+        }
+
+        error_log( 'Automatic updates complete.' );
 
         // Next, process any core update.
@@ -1164 +1297 @@
             // List failed plugin updates.
             if ( ! empty( $failed_updates['plugin'] ) ) {
-                $body[] = __( 'These plugins failed to update:' );
+                $body[] = __( 'The' );
 
                 foreach ( $failed_updates['plugin'] as $item ) {
@@ -1552 +1685 @@
         wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

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

@@ -902 +902 @@
 
         if ( is_wp_error( $result ) ) {
+
             if ( ! empty( $options['hook_extra']['temp_backup'] ) ) {
                 $this->temp_restores[] = $options['hook_extra']['temp_backup'];
@@ -910 +911 @@
                  * so in case the failure was due to a PHP timeout,
                  * it will still be able to properly restore the previous version.
+
+
+
+
                  */
-                add_action( 'shutdown', array( $this, 'restore_temp_backup' ) );
+                add_action( 'shutdown', array( $this, 'restore_temp_backup' ) );
             }
             $this->skin->error( $result );
@@ -984 +989 @@
     public function maintenance_mode( $enable = false ) {
         global $wp_filesystem;
+
+
+
+
+
+
         $file = $wp_filesystem->abspath() . '.maintenance';
         if ( $enable ) {
-            $this->skin->feedback( 'maintenance_start' );
+            if ( ! wp_doing_cron() ) {
+                $this->skin->feedback( 'maintenance_start' );
+            }
             // Create maintenance file to signal that we are upgrading.
             $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
@@ -992 +1005 @@
             $wp_filesystem->put_contents( $file, $maintenance_string, FS_CHMOD_FILE );
         } elseif ( ! $enable && $wp_filesystem->exists( $file ) ) {
-            $this->skin->feedback( 'maintenance_end' );
+            if ( ! wp_doing_cron() ) {
+                $this->skin->feedback( 'maintenance_end' );
+            }
             $wp_filesystem->delete( $file );
         }
@@ -1134 +1149 @@
      *
      * @since 6.3.0
+
      *
      * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
      *
+
+
+
+
+
+
+
+
+
+
+
      * @return bool|WP_Error True on success, false on early exit, otherwise WP_Error.
      */
-    public function restore_temp_backup() {
+    public function restore_temp_backup() {
         global $wp_filesystem;
 
         $errors = new WP_Error();
 
-        foreach ( $this->temp_restores as $args ) {
+        if ( empty( $temp_backups ) ) {
+            $temp_backups = $this->temp_restores;
+        }
+
+        foreach ( $temp_backups as $args ) {
             if ( empty( $args['slug'] ) || empty( $args['src'] ) || empty( $args['dir'] ) ) {
                 return false;
@@ -1187 +1218 @@
      *
      * @since 6.3.0
+
      *
      * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
      *
+
+
+
+
+
+
+
+
+
+
+
      * @return bool|WP_Error True on success, false on early exit, otherwise WP_Error.
      */
-    public function delete_temp_backup() {
+    public function delete_temp_backup() {
         global $wp_filesystem;
 
         $errors = new WP_Error();
 
-        foreach ( $this->temp_backups as $args ) {
+        if ( empty( $temp_backups ) ) {
+            $temp_backups = $this->temp_backups;
+        }
+
+        foreach ( $temp_backups as $args ) {
             if ( empty( $args['slug'] ) || empty( $args['dir'] ) ) {
                 return false;

trunk/src/wp-includes/load.php

@@ -419 +419 @@
     if ( ( time() - $upgrading ) >= 10 * MINUTE_IN_SECONDS ) {
         return false;
+
+
+
+
+
+
+
+
+
+
     }