From 3cccd102ba543e02725d247893729e5c73b38295 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Apr 2022 10:00:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-10-stable-ee --- doc/administration/operations/fast_ssh_key_lookup.md | 5 +++-- doc/administration/operations/puma.md | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'doc/administration/operations') diff --git a/doc/administration/operations/fast_ssh_key_lookup.md b/doc/administration/operations/fast_ssh_key_lookup.md index 8877b1266e0..477a11dd899 100644 --- a/doc/administration/operations/fast_ssh_key_lookup.md +++ b/doc/administration/operations/fast_ssh_key_lookup.md @@ -31,7 +31,8 @@ able to accept a fingerprint. Check the version of OpenSSH on your server with ` ## Fast lookup is required for Geo **(PREMIUM)** -By default, GitLab manages an `authorized_keys` file that is located in the +Unlike [Cloud Native GitLab](https://docs.gitlab.com/charts/), Omnibus GitLab by default +manages an `authorized_keys` file that is located in the `git` user's home directory. For most installations, this will be located under `/var/opt/gitlab/.ssh/authorized_keys`, but you can use the following command to locate the `authorized_keys` on your system: @@ -83,7 +84,7 @@ file (start the line with a `#` to comment it), and from your local machine, att ssh -T git@gitlab.example.com ``` -A successful pull or [welcome message](../../ssh/index.md#verify-that-you-can-connect) would mean that GitLab was able to find the key in the database, +A successful pull or [welcome message](../../user/ssh.md#verify-that-you-can-connect) would mean that GitLab was able to find the key in the database, since it is not present in the file anymore. NOTE: diff --git a/doc/administration/operations/puma.md b/doc/administration/operations/puma.md index 9e828b39f46..c12f75989c3 100644 --- a/doc/administration/operations/puma.md +++ b/doc/administration/operations/puma.md @@ -108,6 +108,12 @@ To change the worker timeout to 600 seconds: ## Disable Puma clustered mode in memory-constrained environments +WARNING: +This is an experimental [Alpha feature](../../policy/alpha-beta-support.md#alpha-features) and subject to change without notice. The feature +is not ready for production use. If you want to use this feature, we recommend testing +with non-production data first. See the [known issues](#puma-single-mode-known-issues) +for additional details. + In a memory-constrained environment with less than 4GB of RAM available, consider disabling Puma [clustered mode](https://github.com/puma/puma#clustered-mode). @@ -131,6 +137,8 @@ For details on Puma worker and thread settings, see the [Puma requirements](../. The downside of running Puma in this configuration is the reduced throughput, which can be considered a fair tradeoff in a memory-constrained environment. +### Puma single mode known issues + When running Puma in single mode, some features are not supported: - [Phased restart](https://gitlab.com/gitlab-org/gitlab/-/issues/300665) -- cgit v1.2.3