summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-02-11 10:44:39 +0000
committerRémy Coutable <remy@rymai.me>2019-02-11 10:44:39 +0000
commite927833b941122f25252712bc68b37041b38ba2c (patch)
tree292183ca0f749e59520512dbf55a6bc620b6a632
parent15af0a45083a8fb6a545616f1c48ace00b70b66a (diff)
parent3a83668703076d87a03dcd60166796406ed7ea6e (diff)
downloadgitlab-ce-e927833b941122f25252712bc68b37041b38ba2c.tar.gz
Merge branch 'patch-22' into 'master'
use timeout as it appears in logs See merge request gitlab-org/gitlab-ce!21264
-rw-r--r--doc/administration/restart_gitlab.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/administration/restart_gitlab.md b/doc/administration/restart_gitlab.md
index b561c2f82aa..7d245b3effd 100644
--- a/doc/administration/restart_gitlab.md
+++ b/doc/administration/restart_gitlab.md
@@ -62,7 +62,8 @@ sudo gitlab-ctl status
Notice that all services say `ok: run`.
-Sometimes, components time out during the restart and sometimes they get stuck.
+Sometimes, components time out (look for `timeout` in the logs) during the
+restart and sometimes they get stuck.
In that case, you can use `gitlab-ctl kill <service>` to send the `SIGKILL`
signal to the service, for example `sidekiq`. After that, a restart should
perform fine.