summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bodenmiller <bbodenmiller@hotmail.com>2018-08-17 07:11:34 +0000
committerBen Bodenmiller <bbodenmiller@hotmail.com>2018-08-17 07:11:34 +0000
commitb7407d9bc09ae856d8528373b006e9260f13fcef (patch)
treedeada9b8f82e4600b8a0c35700a0e67618bf90b8
parentb997fabfb40a21f203faf8e4d380972d402194a6 (diff)
downloadgitlab-ce-b7407d9bc09ae856d8528373b006e9260f13fcef.tar.gz
replace nobootwait with nofail
missed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16985
-rw-r--r--doc/administration/high_availability/nfs.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index 387c3fb6a5b..cd2284f5f2a 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -55,14 +55,14 @@ Below is an example of an NFS mount point defined in `/etc/fstab` we use on
GitLab.com:
```
-10.1.1.1:/var/opt/gitlab/git-data /var/opt/gitlab/git-data nfs4 defaults,soft,rsize=1048576,wsize=1048576,noatime,nobootwait,lookupcache=positive 0 2
+10.1.1.1:/var/opt/gitlab/git-data /var/opt/gitlab/git-data nfs4 defaults,soft,rsize=1048576,wsize=1048576,noatime,nofail,lookupcache=positive 0 2
```
Notice several options that you should consider using:
| Setting | Description |
| ------- | ----------- |
-| `nobootwait` | Don't halt boot process waiting for this mount to become available
+| `nofail` | Don't halt boot process waiting for this mount to become available
| `lookupcache=positive` | Tells the NFS client to honor `positive` cache results but invalidates any `negative` cache results. Negative cache results cause problems with Git. Specifically, a `git push` can fail to register uniformly across all NFS clients. The negative cache causes the clients to 'remember' that the files did not exist previously.
## A single NFS mount