From 2931472c10363925ae473bc646f53f7f58afad36 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 18 Jan 2021 06:10:43 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/docs.gitlab-ci.yml | 2 +- doc/.vale/gitlab/Acronyms.yml | 1 + .../gitlab_gitaly_version_mismatch_v12_4.png | Bin 21779 -> 0 bytes doc/administration/gitaly/index.md | 20 ++++++++---------- .../troubleshooting.md | 9 ++------ 5 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 doc/administration/gitaly/img/gitlab_gitaly_version_mismatch_v12_4.png diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index c9eb782935b..955f44c6216 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -43,7 +43,7 @@ docs-lint markdown: - .default-retry - .docs:rules:docs-lint # When updating the image version here, update it in /scripts/lint-doc.sh too. - image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.12-vale-2.6.1-markdownlint-0.24.0" + image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.12-vale-2.8.0-markdownlint-0.26.0" stage: test needs: [] script: diff --git a/doc/.vale/gitlab/Acronyms.yml b/doc/.vale/gitlab/Acronyms.yml index 5e6a106af55..481da94c627 100644 --- a/doc/.vale/gitlab/Acronyms.yml +++ b/doc/.vale/gitlab/Acronyms.yml @@ -91,6 +91,7 @@ exceptions: - NGINX - NOTE - NPM + - NTP - ONLY - OWASP - PAT diff --git a/doc/administration/gitaly/img/gitlab_gitaly_version_mismatch_v12_4.png b/doc/administration/gitaly/img/gitlab_gitaly_version_mismatch_v12_4.png deleted file mode 100644 index 4d2c5cdb00ca11015f57c4c1a2d7840ac666c86c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21779 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 JQ>BH7{2%zbFC_o~ diff --git a/doc/administration/gitaly/index.md b/doc/administration/gitaly/index.md index e0b0d52fe3f..9577fb40abe 100644 --- a/doc/administration/gitaly/index.md +++ b/doc/administration/gitaly/index.md @@ -395,7 +395,7 @@ Gitaly makes the following assumptions: You can't define Gitaly servers with some as a local Gitaly server (without `gitaly_address`) and some as remote -server (with `gitaly_address`) unless you setup with special +server (with `gitaly_address`) unless you use [mixed configuration](#mixed-configuration). **For Omnibus GitLab** @@ -502,8 +502,8 @@ If it's excluded, default Git storage directory is used for that storage shard. ### Disable Gitaly where not required (optional) -If you are running Gitaly [as a remote service](#run-gitaly-on-its-own-server) you may want to -disable the local Gitaly service that runs on your GitLab server by default, leaving it only running +If you are running Gitaly [as a remote service](#run-gitaly-on-its-own-server), you may want to +disable the local Gitaly service that runs on your GitLab server by default and have it only running where required. Disabling Gitaly on the GitLab instance only makes sense when you run GitLab in a custom cluster configuration, where @@ -1007,7 +1007,7 @@ When GitLab calls a function that has a "Rugged patch", it performs two checks: - Is the feature flag for this patch set in the database? If so, the feature flag setting controls the GitLab use of "Rugged patch" code. -- If the feature flag is not set, GitLab tries accessing the filesystem underneath the +- If the feature flag is not set, GitLab tries accessing the file system underneath the Gitaly server directly. If it can, it uses the "Rugged patch": - If using Unicorn. - If using Puma and [thread count](../../install/requirements.md#puma-threads) is set @@ -1015,9 +1015,9 @@ When GitLab calls a function that has a "Rugged patch", it performs two checks: The result of these checks is cached. -To see if GitLab can access the repository filesystem directly, we use the following heuristic: +To see if GitLab can access the repository file system directly, we use the following heuristic: -- Gitaly ensures that the filesystem has a metadata file in its root with a UUID in it. +- Gitaly ensures that the file system has a metadata file in its root with a UUID in it. - Gitaly reports this UUID to GitLab via the `ServerInfo` RPC. - GitLab Rails tries to read the metadata file directly. If it exists, and if the UUID's match, assume we have direct access. @@ -1044,13 +1044,11 @@ The second facet presents the only real solution. For this, we developed Check [Gitaly timeouts](../../user/admin_area/settings/gitaly_timeouts.md) when troubleshooting Gitaly. -### Checking versions when using standalone Gitaly servers +### Check versions when using standalone Gitaly servers When using standalone Gitaly servers, you must make sure they are the same version -as GitLab to ensure full compatibility. Check **Admin Area > Gitaly Servers** on -your GitLab instance and confirm all Gitaly Servers are `Up to date`. - -![Gitaly standalone software versions diagram](img/gitlab_gitaly_version_mismatch_v12_4.png) +as GitLab to ensure full compatibility. Check **Admin Area > Overview > Gitaly Servers** on +your GitLab instance and confirm all Gitaly servers indicate that they are up to date. ### `gitaly-debug` diff --git a/doc/administration/reference_architectures/troubleshooting.md b/doc/administration/reference_architectures/troubleshooting.md index 8fcdb457d6a..835231ac584 100644 --- a/doc/administration/reference_architectures/troubleshooting.md +++ b/doc/administration/reference_architectures/troubleshooting.md @@ -206,13 +206,8 @@ To make sure your configuration is correct: ## Troubleshooting Gitaly -### Checking versions when using standalone Gitaly nodes - -When using standalone Gitaly nodes, you must make sure they are the same version -as GitLab to ensure full compatibility. Check **Admin Area > Gitaly Servers** on -your GitLab instance and confirm all Gitaly Servers are `Up to date`. - -![Gitaly standalone software versions diagram](../gitaly/img/gitlab_gitaly_version_mismatch_v12_4.png) +If you have any problems when using standalone Gitaly nodes, first +[check all the versions are up to date](../gitaly/index.md#check-versions-when-using-standalone-gitaly-servers). ### `gitaly-debug`