From b0df33e6ecd715ae67552ce57030581b158f5623 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Fri, 5 May 2017 19:55:29 -0700
Subject: [PATCH] (stable) Don't apply patches or mark patches applied with
 `bin/storage upgrade --dryrun`

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
---
 .../workflow/PhabricatorStorageManagementWorkflow.php     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
index e915cedb8d..48d753781d 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php
@@ -1090,7 +1090,9 @@ abstract class PhabricatorStorageManagementWorkflow
             }
 
             $t_begin = microtime(true);
-            $api->applyPatch($patch);
+            if (!$is_dryrun) {
+              $api->applyPatch($patch);
+            }
             $t_end = microtime(true);
 
             $duration = ($t_end - $t_begin);
@@ -1100,7 +1102,9 @@ abstract class PhabricatorStorageManagementWorkflow
           // If we're explicitly reapplying this patch, we don't need to
           // mark it as applied.
           if (!isset($state_map[$ref_key][$key])) {
-            $api->markPatchApplied($key, ($t_end - $t_begin));
+            if (!$is_dryrun) {
+              $api->markPatchApplied($key, ($t_end - $t_begin));
+            }
             $applied_map[$ref_key][$key] = true;
           }
         }