revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-15 18:10:53 +01:00
Code Issues Releases Wiki Activity

(stable) Don't apply patches or mark patches applied with bin/storage upgrade --dryrun

Browse source 
Summary: Fixes T12682.

Test Plan: Ran `bin/storage upgrade --dryrun` repeatedly with un-applied patches, saw it not apply them and not mark them applied.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T12682

Differential Revision: https://secure.phabricator.com/D17837
This commit is contained in:
epriestley 2017-05-05 19:55:29 -07:00
parent 22c3e49b51
commit b0df33e6ec
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
View file

@ -1090,7 +1090,9 @@ abstract class PhabricatorStorageManagementWorkflow
} }
$t_begin = microtime(true); $t_begin = microtime(true);
if (!$is_dryrun) {
$api->applyPatch($patch); $api->applyPatch($patch);
}
$t_end = microtime(true); $t_end = microtime(true);
$duration = ($t_end - $t_begin); $duration = ($t_end - $t_begin);
@ -1100,7 +1102,9 @@ abstract class PhabricatorStorageManagementWorkflow
// If we're explicitly reapplying this patch, we don't need to // If we're explicitly reapplying this patch, we don't need to
// mark it as applied. // mark it as applied.
if (!isset($state_map[$ref_key][$key])) { if (!isset($state_map[$ref_key][$key])) {
if (!$is_dryrun) {
$api->markPatchApplied($key, ($t_end - $t_begin)); $api->markPatchApplied($key, ($t_end - $t_begin));
}
$applied_map[$ref_key][$key] = true; $applied_map[$ref_key][$key] = true;
} }
} }