From ae97e5d5fb685ee28584d9e13e7443c6b07b2b53 Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Wed, 5 Jun 2019 18:43:38 +0000 Subject: disable Rugged when switching to Gitaly without NFS --- doc/administration/gitaly/index.md | 3 +++ doc/administration/high_availability/nfs.md | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md index dcf8d8715ca..53a85dfad6c 100644 --- a/doc/administration/gitaly/index.md +++ b/doc/administration/gitaly/index.md @@ -220,6 +220,9 @@ network, firewall, or name resolution problem preventing your GitLab server from reaching the Gitaly server then all Gitaly requests will fail. +Additionally, you need to +[disable Rugged if previously manually enabled](../high_availability/nfs.md#improving-nfs-performance-with-gitlab). + We assume that your Gitaly server can be reached at `gitaly.internal:8075` from your GitLab server, and that Gitaly can read and write to `/mnt/gitlab/default` and `/mnt/gitlab/storage1` respectively. diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md index f6bbc8935b4..490c2699458 100644 --- a/doc/administration/high_availability/nfs.md +++ b/doc/administration/high_availability/nfs.md @@ -56,7 +56,8 @@ To do this, run the Rake task: sudo gitlab-rake gitlab:features:enable_rugged ``` -If you need to undo this setting for some reason, run: +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 -- cgit v1.2.1