Commit 53f3cc64 authored by Ben Bodenmiller's avatar Ben Bodenmiller Committed by Achilleas Pipinellis

Clarify when LFS objects are sent to object storage

parent 50de2678
...@@ -156,7 +156,7 @@ On Omnibus installations, the settings are prefixed by `lfs_object_store_`: ...@@ -156,7 +156,7 @@ On Omnibus installations, the settings are prefixed by `lfs_object_store_`:
This will migrate existing LFS objects to object storage. New LFS objects This will migrate existing LFS objects to object storage. New LFS objects
will be forwarded to object storage unless will be forwarded to object storage unless
`gitlab_rails['lfs_object_store_background_upload']` is set to false. `gitlab_rails['lfs_object_store_background_upload']` and `gitlab_rails['lfs_object_store_direct_upload']` is set to `false`.
### S3 for installations from source ### S3 for installations from source
...@@ -191,14 +191,14 @@ For source installations the settings are nested under `lfs:` and then ...@@ -191,14 +191,14 @@ For source installations the settings are nested under `lfs:` and then
``` ```
This will migrate existing LFS objects to object storage. New LFS objects This will migrate existing LFS objects to object storage. New LFS objects
will be forwarded to object storage unless `background_upload` is set to will be forwarded to object storage unless `background_upload` and `direct_upload` is set to
false. `false`.
### Migrating back to local storage ### Migrating back to local storage
In order to migrate back to local storage: In order to migrate back to local storage:
1. Set both `direct_upload` and `background_upload` to false under the LFS object storage settings. Don't forget to restart GitLab. 1. Set both `direct_upload` and `background_upload` to `false` under the LFS object storage settings. Don't forget to restart GitLab.
1. Run `rake gitlab:lfs:migrate_to_local` on your console. 1. Run `rake gitlab:lfs:migrate_to_local` on your console.
1. Disable `object_storage` for LFS objects in `gitlab.rb`. Remember to restart GitLab afterwards. 1. Disable `object_storage` for LFS objects in `gitlab.rb`. Remember to restart GitLab afterwards.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment