<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25649] trunk/src: Automatic Updates: Add a rollback functionality upon installation failure, the rollback package will be available for partial-updates for automatic updates and be similar to our existing partial builds (but in reverse).</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25649">25649</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-09-30 00:20:35 +0000 (Mon, 30 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Automatic Updates: Add a rollback functionality upon installation failure, the rollback package will be available for partial-updates for automatic updates and be similar to our existing partial builds (but in reverse).
A further iteration of this is to also detect whitescreens (fatals) after a auto update, and trigger the rollback for that too.
See <a href="http://core.trac.wordpress.org/ticket/22704">#22704</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php (25648 => 25649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2013-09-29 23:07:59 UTC (rev 25648)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2013-09-30 00:20:35 UTC (rev 25649)
</span><span class="lines">@@ -1224,13 +1224,17 @@
</span><span class="cx"> $this->strings['unpack_package'] = __('Unpacking the update…');
</span><span class="cx"> $this->strings['copy_failed'] = __('Could not copy files.');
</span><span class="cx"> $this->strings['copy_failed_space'] = __('Could not copy files. You may have run out of disk space.' );
</span><ins>+ $this->strings['start_rollback'] = __( 'Attempting to rollback to previous version.' );
+ $this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has rolled back to your previous version' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function upgrade( $current, $args = array() ) {
</span><span class="cx"> global $wp_filesystem, $wp_version;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'pre_check_md5' => true,
</del><ins>+ 'pre_check_md5' => true,
+ 'attempt_rollback' => false,
+ 'do_rollback' => false,
</ins><span class="cx"> );
</span><span class="cx"> $parsed_args = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><span class="lines">@@ -1251,14 +1255,18 @@
</span><span class="cx"> get_core_checksums( array( $wp_version, $current->version ) );
</span><span class="cx">
</span><span class="cx"> $no_partial = false;
</span><del>- if ( $parsed_args['pre_check_md5'] && ! $this->check_files() )
</del><ins>+ if ( $parsed_args['do_rollback'] )
</ins><span class="cx"> $no_partial = true;
</span><ins>+ elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() )
+ $no_partial = true;
</ins><span class="cx">
</span><span class="cx"> // If partial update is returned from the API, use that, unless we're doing a reinstall.
</span><span class="cx"> // If we cross the new_bundled version number, then use the new_bundled zip.
</span><span class="cx"> // Don't though if the constant is set to skip bundled items.
</span><span class="cx"> // If the API returns a no_content zip, go with it. Finally, default to the full zip.
</span><del>- if ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && ! $no_partial )
</del><ins>+ if ( $parsed_args['do_rollback'] && $current->packages->rollback )
+ $to_download = 'rollback';
+ elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && ! $no_partial )
</ins><span class="cx"> $to_download = 'partial';
</span><span class="cx"> elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
</span><span class="cx"> && ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) )
</span><span class="lines">@@ -1283,12 +1291,22 @@
</span><span class="cx"> }
</span><span class="cx"> $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
</span><span class="cx">
</span><del>- require(ABSPATH . 'wp-admin/includes/update-core.php');
</del><ins>+ require_once( ABSPATH . 'wp-admin/includes/update-core.php' );
</ins><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'update_core' ) )
</span><span class="cx"> return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] );
</span><span class="cx">
</span><del>- $result = update_core( $working_dir, $wp_dir );
</del><ins>+ $result = update_core( $working_dir, $wp_dir, $parsed_args['do_rollback'] );
+
+ // In the event of an error, rollback to the previous version
+ if ( is_wp_error( $result ) && $parsed_args['attempt_rollback'] && $current->packages->rollback ) {
+ apply_filters( 'update_feedback', $result );
+ apply_filters( 'update_feedback', $this->strings['start_rollback'] );
+
+ $this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) );
+
+ $result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'] );
+ }
</ins><span class="cx"> do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ), $result );
</span><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="lines">@@ -1630,6 +1648,7 @@
</span><span class="cx"> $upgrade_result = $upgrader->upgrade( $item, array(
</span><span class="cx"> 'clear_update_cache' => false,
</span><span class="cx"> 'pre_check_md5' => false, /* always use partial builds if possible for core updates */
</span><ins>+ 'attempt_rollback' => true, /* only available for core updates */
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Core doesn't output this, so lets append it so we don't get confused
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/update-core.php (25648 => 25649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/update-core.php 2013-09-29 23:07:59 UTC (rev 25648)
+++ trunk/src/wp-admin/includes/update-core.php 2013-09-30 00:20:35 UTC (rev 25649)
</span><span class="lines">@@ -665,7 +665,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE );
</span><del>- require_once( WP_CONTENT_DIR . '/upgrade/version-current.php' );
</del><ins>+ require( WP_CONTENT_DIR . '/upgrade/version-current.php' );
</ins><span class="cx"> $wp_filesystem->delete( $versions_file );
</span><span class="cx">
</span><span class="cx"> $php_version = phpversion();
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/update.php (25648 => 25649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/update.php 2013-09-29 23:07:59 UTC (rev 25648)
+++ trunk/src/wp-admin/includes/update.php 2013-09-30 00:20:35 UTC (rev 25649)
</span><span class="lines">@@ -136,6 +136,8 @@
</span><span class="cx">
</span><span class="cx"> // Cache the checksums for later
</span><span class="cx"> foreach ( $version as $v ) {
</span><ins>+ if ( ! isset( $body['checksums'][ $v ] ) )
+ $body['checksums'][ $v ] = false;
</ins><span class="cx"> set_site_transient( "core_checksums_$v", $body['checksums'][ $v ], HOUR_IN_SECONDS );
</span><span class="cx"> $return[ $v ] = $body['checksums'][ $v ];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/update.php (25648 => 25649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/update.php 2013-09-29 23:07:59 UTC (rev 25648)
+++ trunk/src/wp-includes/update.php 2013-09-30 00:20:35 UTC (rev 25649)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> foreach ( $offer as $offer_key => $value ) {
</span><span class="cx"> if ( 'packages' == $offer_key )
</span><span class="cx"> $offer['packages'] = (object) array_intersect_key( array_map( 'esc_url', $offer['packages'] ),
</span><del>- array_fill_keys( array( 'full', 'no_content', 'new_bundled', 'partial' ), '' ) );
</del><ins>+ array_fill_keys( array( 'full', 'no_content', 'new_bundled', 'partial', 'rollback' ), '' ) );
</ins><span class="cx"> elseif ( 'download' == $offer_key )
</span><span class="cx"> $offer['download'] = esc_url( $value );
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>