From 6710cc111596c3710c9b3cf5636f3f2e9b60878c Mon Sep 17 00:00:00 2001 From: Priyan Sureshbabu Date: Thu, 8 Jun 2023 10:16:49 +0000 Subject: [PATCH 1/3] Update file globals.md --- doc/charts/globals.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/charts/globals.md b/doc/charts/globals.md index c1379ef5ec..bd9f87f281 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -1958,6 +1958,18 @@ global: Configure the request timeout (in seconds) after which a Webservice worker process is killed by the Webservice master process. The default value is 60 seconds. +NOTE: +`global.webservice.workerTimeout` does not affect the maximum request duration. To set maximum request duration, set the following environment variables. For more details, see [chart issue #2191](https://gitlab.com/gitlab-org/charts/gitlab/-/issues/2191) and [Change the worker timeout](https://docs.gitlab.com/ee/administration/operations/puma.html#change-the-worker-timeout) documentation. + +```yaml +gitlab: + webservice: + workerTimeout: 60 + extraEnv: + GITLAB_RAILS_RACK_TIMEOUT: "60" + GITLAB_RAILS_WAIT_TIMEOUT: "90" +``` + ## Custom Certificate Authorities NOTE: -- GitLab From f09b76cdd2ed5d2c67e3df8fc0b4926b514edeb2 Mon Sep 17 00:00:00 2001 From: Priyan Sureshbabu Date: Thu, 8 Jun 2023 10:22:33 +0000 Subject: [PATCH 2/3] Fixes doc lint --- doc/charts/globals.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/charts/globals.md b/doc/charts/globals.md index bd9f87f281..61fd3077aa 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -1959,7 +1959,7 @@ Configure the request timeout (in seconds) after which a Webservice worker proce is killed by the Webservice master process. The default value is 60 seconds. NOTE: -`global.webservice.workerTimeout` does not affect the maximum request duration. To set maximum request duration, set the following environment variables. For more details, see [chart issue #2191](https://gitlab.com/gitlab-org/charts/gitlab/-/issues/2191) and [Change the worker timeout](https://docs.gitlab.com/ee/administration/operations/puma.html#change-the-worker-timeout) documentation. +The `global.webservice.workerTimeout` setting does not affect the maximum request duration. To set maximum request duration, set the following environment variables. For more details, see [chart issue #2191](https://gitlab.com/gitlab-org/charts/gitlab/-/issues/2191) and [Change the worker timeout](https://docs.gitlab.com/ee/administration/operations/puma.html#change-the-worker-timeout) documentation. ```yaml gitlab: -- GitLab From 1eaeb5d30b0e81eadd6e7a192257c66b6b6a7025 Mon Sep 17 00:00:00 2001 From: Priyan Sureshbabu Date: Thu, 8 Jun 2023 10:28:39 +0000 Subject: [PATCH 3/3] Remove note --- doc/charts/globals.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/charts/globals.md b/doc/charts/globals.md index 61fd3077aa..b51afb1c6b 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -1958,7 +1958,6 @@ global: Configure the request timeout (in seconds) after which a Webservice worker process is killed by the Webservice master process. The default value is 60 seconds. -NOTE: The `global.webservice.workerTimeout` setting does not affect the maximum request duration. To set maximum request duration, set the following environment variables. For more details, see [chart issue #2191](https://gitlab.com/gitlab-org/charts/gitlab/-/issues/2191) and [Change the worker timeout](https://docs.gitlab.com/ee/administration/operations/puma.html#change-the-worker-timeout) documentation. ```yaml -- GitLab