From 3d5a6fc3106460294d9d241c7fcc7c205a3d6126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Sch=C3=BCtze?= Date: Fri, 18 Oct 2019 18:35:34 +0000 Subject: [PATCH] Don't use workerTimeout of 60 by default, use 120 instead. --- charts/gitlab/charts/unicorn/values.yaml | 2 +- doc/charts/gitlab/unicorn/index.md | 4 ++-- doc/installation/command-line-options.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/gitlab/charts/unicorn/values.yaml b/charts/gitlab/charts/unicorn/values.yaml index 79aa14e7e4..f9dfc4410a 100644 --- a/charts/gitlab/charts/unicorn/values.yaml +++ b/charts/gitlab/charts/unicorn/values.yaml @@ -47,7 +47,7 @@ ingress: # enabled: true annotations: {} workerProcesses: 2 -workerTimeout: 60 +workerTimeout: 120 memory: # in MB units min: 700 max: 1024 diff --git a/doc/charts/gitlab/unicorn/index.md b/doc/charts/gitlab/unicorn/index.md index a3bf1b9435..985d306711 100644 --- a/doc/charts/gitlab/unicorn/index.md +++ b/doc/charts/gitlab/unicorn/index.md @@ -82,7 +82,7 @@ to the `helm install` command using the `--set` flags. | `tolerations` | `[]` | Toleration labels for pod assignment | | `trusted_proxies` | `[]` | See [GitLab documentation](https://docs.gitlab.com/ee/install/installation.html#adding-your-trusted-proxies) for details | | `workerProcesses` | `2` | Unicorn number of workers | -| `workerTimeout` | `60` | Unicorn worker timeout | +| `workerTimeout` | `120` | Unicorn worker timeout | | `workhorse.livenessProbe.initialDelaySeconds` | 20 | Delay before liveness probe is initiated | | `workhorse.livenessProbe.periodSeconds` | 60 | How often to perform the liveness probe | | `workhorse.livenessProbe.timeoutSeconds` | 30 | When the liveness probe times out | @@ -286,7 +286,7 @@ The following values are used to configure the Unicorn Pods. |:----------------- |:-------:|:------- |:----------- | | `replicaCount` | Integer | `1` | The number of Unicorn instances to create in the deployment. | | `workerProcesses` | Integer | `2` | The number of Unicorn workers to run per pod. You must have at least `2` workers available in your cluster in order for GitLab to function properly. Note that increasing the `workerProcesses` will increase the memory required by approximately `400MB` per worker, so you should update the pod `resources` accordingly. | -| `workerTimeout` | Integer | `60` | The number of seconds a request can be pending before it times out. | +| `workerTimeout` | Integer | `120` | The number of seconds a request can be pending before it times out. | ### metrics.enabled diff --git a/doc/installation/command-line-options.md b/doc/installation/command-line-options.md index bc0f945817..c6b3a7c457 100644 --- a/doc/installation/command-line-options.md +++ b/doc/installation/command-line-options.md @@ -338,7 +338,7 @@ See [`nginx-ingress` chart](../charts/nginx/index.md). | `gitlab.unicorn.shell.authToken.key` | Key to shell token in shell secret | `secret` | | `gitlab.unicorn.shell.authToken.secret` | Shell token secret | `{Release.Name}-gitlab-shell-secret` | | `gitlab.unicorn.workerProcesses` | Unicorn number of workers | `2` | -| `gitlab.unicorn.workerTimeout` | Unicorn worker timeout | `60` | +| `gitlab.unicorn.workerTimeout` | Unicorn worker timeout | `120` | | `gitlab.unicorn.workhorse.extraArgs` | String of extra parameters for workhorse | "" | | `gitlab.unicorn.workhorse.image` | Workhorse image repository | `registry.gitlab.com/gitlab-org/build/cng/gitlab-workhorse-ee` | | `gitlab.unicorn.workhorse.sentryDSN` | DSN for Sentry instance for error reporting | "" | -- GitLab