diff options
Diffstat (limited to 'doc/update/restore_after_failure.md')
| -rw-r--r-- | doc/update/restore_after_failure.md | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/doc/update/restore_after_failure.md b/doc/update/restore_after_failure.md index e9c2c69ecb9..b8cceb8c367 100644 --- a/doc/update/restore_after_failure.md +++ b/doc/update/restore_after_failure.md @@ -13,7 +13,7 @@ However, it's important to know how to recover when problems do arise. In some cases after a failed upgrade, the fastest solution is to roll back to the previous version you were using. We recommend this path because the failed -upgrade will likely have made database changes that can not be readily reverted. +upgrade might have made database changes that cannot be readily reverted. First, roll back the code or package. For source installations this involves checking out the older version (branch or tag). For Omnibus installations this @@ -33,7 +33,7 @@ older backup it can lead to migration failures on future upgrades. Starting in GitLab 8.6 we drop all tables prior to importing the backup to prevent this problem. If you've restored a backup to a version prior to 8.6 you -may need to manually correct the problem next time you upgrade. +may have to manually correct the problem next time you upgrade. Example error: @@ -49,8 +49,8 @@ PG::DuplicateTable: ERROR: relation "lfs_objects" already exists Copy the version from the error. In this case the version number is `20151103134857`. ->**WARNING:** Use the following steps only if you are certain this is what you -need to do. +WARNING: +Use the following steps only if you are certain you must do them. ### GitLab 8.6+ @@ -65,9 +65,8 @@ sudo -u git -H bundle exec rake gitlab:db:mark_migration_complete[20151103134857 sudo gitlab-rake gitlab:db:mark_migration_complete[20151103134857] ``` -Once the migration is successfully marked, run the Rake `db:migrate` task again. -You might need to repeat this process several times until all failed -migrations are marked complete. +After the migration is successfully marked, run the Rake `db:migrate` task again. +Repeat this process until all failed migrations are complete. ### GitLab < 8.6 @@ -86,6 +85,5 @@ ActiveRecord::Base.connection.execute("INSERT INTO schema_migrations (version) V exit ``` -Once the migration is successfully marked, run the Rake `db:migrate` task again. -You might need to repeat this process several times until all failed -migrations are marked complete. +After the migration is successfully marked, run the Rake `db:migrate` task again. +Repeat this process until all failed migrations are complete. |