summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-07-16 06:51:35 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-07-16 06:51:35 +0000
commit22119a39131e288f1a5ad747e5485ff0ea1ea323 (patch)
tree40fd40b9301628469ee292f4633b5efbf4288c32
parent831c7f819bd9e637a1ff8deebd0d80f0c7597169 (diff)
parent6400a9c821d2a59c684b3343aa181350a97d0ec5 (diff)
downloadgitlab-ce-22119a39131e288f1a5ad747e5485ff0ea1ea323.tar.gz
Merge branch 'jc-documentation-update-nfs-autodetection' into 'master'
Add nfs autodetection section in NFS docs Closes gitaly#1767 See merge request gitlab-org/gitlab-ce!30486
-rw-r--r--doc/administration/high_availability/nfs.md22
1 files changed, 4 insertions, 18 deletions
diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index ea8302f6086..294f0e969d5 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -51,29 +51,15 @@ management between systems:
### Improving NFS performance with GitLab
-NOTE: **Note:** This is only available starting in certain versions of GitLab: 11.5.11,
-11.6.11, 11.7.12, 11.8.8, 11.9.0 and up (e.g. 11.10, 11.11, etc.)
+NOTE: **Note:** From GitLab 12.1, it will automatically be detected if Rugged can and should be used per storage.
-If you are using NFS to share Git data, we recommend that you enable a
-number of feature flags that will allow GitLab application processes to
-access Git data directly instead of going through the [Gitaly
-service](../gitaly/index.md). Depending on your workload and disk
-performance, these flags may help improve performance. See [the
-issue](https://gitlab.com/gitlab-org/gitlab-ce/issues/57317) for more
-details.
-
-To do this, run the Rake task:
+If you previously enabled Rugged using the feature flag, you will need to unset the feature flag by using:
```sh
-sudo gitlab-rake gitlab:features:enable_rugged
+sudo gitlab-rake gitlab:features:unset_rugged
```
-If you need to undo this setting for some reason such as switching to [Gitaly without NFS](gitaly.md)
-(recommended), run:
-
-```sh
-sudo gitlab-rake gitlab:features:disable_rugged
-```
+If the Rugged feature flag is explicitly set to either true or false, GitLab will use the value explicitly set.
### Known issues