diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-02 09:10:04 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-02 09:10:04 +0000 |
| commit | acfbeced52db321534c7b03a56a909e280d26914 (patch) | |
| tree | b00a4f220f4b5776fa1a1506a26b4b947b3ef7e7 | |
| parent | 30524901e28176e96e7c0d1a710508367ff99d9f (diff) | |
| parent | c1923aef04d63050376e14033a6a04a1e3ae0904 (diff) | |
| download | gitlab-ce-acfbeced52db321534c7b03a56a909e280d26914.tar.gz | |
Merge branch 'minor_doc_updates' into 'master'
Minor doc updates
## What does this MR do?
Adds to and clarifies some documentation. Specifically, when using `gdb` to debug you need to detach and exit when done. Next, this clarifies the type of file locking that we require.
Thanks to @northrup for the details about mandatory vs. advisory file locking.
Note: These were two really small changes so I combined in to one merge request. However, I left the commits separate for clarity.
See merge request !4421
| -rw-r--r-- | doc/administration/high_availability/nfs.md | 4 | ||||
| -rw-r--r-- | doc/administration/troubleshooting/sidekiq.md | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md index 49ff5d536a1..537f4f3501d 100644 --- a/doc/administration/high_availability/nfs.md +++ b/doc/administration/high_availability/nfs.md @@ -2,8 +2,8 @@ ## Required NFS Server features -**File locking**: GitLab **requires** file locking which is only supported -natively in NFS version 4. NFSv3 also supports locking as long as +**File locking**: GitLab **requires** advisory file locking, which is only +supported natively in NFS version 4. NFSv3 also supports locking as long as Linux Kernel 2.6.5+ is used. We recommend using version 4 and do not specifically test NFSv3. diff --git a/doc/administration/troubleshooting/sidekiq.md b/doc/administration/troubleshooting/sidekiq.md index 134a7583762..a776cd3f05e 100644 --- a/doc/administration/troubleshooting/sidekiq.md +++ b/doc/administration/troubleshooting/sidekiq.md @@ -150,6 +150,14 @@ To output a backtrace from all threads at once: apply all thread bt ``` +Once you're done debugging with `gdb`, be sure to detach from the process and +exit: + +``` +detach +exit +``` + ## Check for blocking queries Sometimes the speed at which Sidekiq processes jobs can be so fast that it can |