diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-17 14:12:57 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-08-17 14:12:57 +0000 |
| commit | c2f14af75e9b65ae8d88d3d025ea63da7bd2106b (patch) | |
| tree | 94b36ea88ab056b924697abd891e5c425323a1e0 | |
| parent | 5309988b2be6ab79a4bbcc2d90442633199246d6 (diff) | |
| parent | b7407d9bc09ae856d8528373b006e9260f13fcef (diff) | |
| download | gitlab-ce-c2f14af75e9b65ae8d88d3d025ea63da7bd2106b.tar.gz | |
Merge branch 'patch-23' into 'master'
replace nobootwait with nofail
See merge request gitlab-org/gitlab-ce!21269
| -rw-r--r-- | doc/administration/high_availability/nfs.md | 4 |
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 |