diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 597bded6aa03ae5fb5e6b987346b21b7063568c0..85dce00752b5be8354239a103bd06a62960432bd 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -81,14 +81,20 @@ - if @project.repository.exists? %li{ class: 'gl-px-5!' } %span.light - = _('Gitaly storage name:') + = s_('ProjectSettings|Storage name:') %strong = @project.repository.storage + %br + %small.gl-text-secondary + = s_('ProjectSettings|For Gitaly, name of the storage that stores the repository. For Gitaly Cluster, name of the virtual storage that stores the repository.') %li{ class: 'gl-px-5!' } %span.light - = _('Gitaly relative path:') + = s_('ProjectSettings|Relative path:') %strong = @project.repository.relative_path + %br + %small.gl-text-secondary + = s_('ProjectSettings|For Gitaly, location of data on the storage. For Gitaly Cluster, location of data on the virtual storage.') %li{ class: 'gl-px-5!' } = render 'shared/storage_counter_statistics', storage_size: @project.statistics&.storage_size, storage_details: @project.statistics diff --git a/doc/administration/geo/disaster_recovery/background_verification.md b/doc/administration/geo/disaster_recovery/background_verification.md index 6d7240a9f92d0268c112ed237e35e9ec4ce293b9..a67edc815c83cff738dd6b990e81113f19e7a1bc 100644 --- a/doc/administration/geo/disaster_recovery/background_verification.md +++ b/doc/administration/geo/disaster_recovery/background_verification.md @@ -143,10 +143,7 @@ If the **primary** and **secondary** sites have a checksum verification mismatch 1. On the left sidebar, select **Overview > Projects**. 1. Find the project that you want to check the checksum differences and select its name. - 1. On the project administration page get the **Gitaly storage name**, - and **Gitaly relative path**. - -  + 1. On the project administration page, get the values in the **Storage name** and **Relative path** fields. 1. On a **Gitaly node on the primary** site and a **Gitaly node on the secondary** site, go to the project's repository directory. If using Gitaly Cluster, [check that it is in a healthy state](../../gitaly/troubleshooting.md#check-cluster-health) prior to running these commands. diff --git a/doc/administration/geo/disaster_recovery/img/checksum-differences-admin-project-page.png b/doc/administration/geo/disaster_recovery/img/checksum-differences-admin-project-page.png deleted file mode 100644 index 0a7b841897b067147268c17fb32fb97487e8e69e..0000000000000000000000000000000000000000 Binary files a/doc/administration/geo/disaster_recovery/img/checksum-differences-admin-project-page.png and /dev/null differ diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md index 9577c4a4cb26a2f1f74df550f21e1f05ec52f556..31dc85364b4246fcbf8e211cb04b096a09e15732 100644 --- a/doc/administration/gitaly/praefect.md +++ b/doc/administration/gitaly/praefect.md @@ -1020,10 +1020,10 @@ Particular attention should be shown to: - The `gitaly['configuration'][:auth][:token]` configured in this section must match the `token` value under `praefect['configuration'][:virtual_storage][<index>][:node][<index>][:token]` on the Praefect node. This value was set in the [previous section](#praefect). This document uses the placeholder `PRAEFECT_INTERNAL_TOKEN` throughout. -- The storage names in `gitaly['configuration'][:storage]` configured in this section must match the - storage names under `praefect['configuration'][:virtual_storage]` on the Praefect node. This +- The physical storage names in `gitaly['configuration'][:storage]` configured in this section must match the + physical storage names under `praefect['configuration'][:virtual_storage]` on the Praefect node. This was set in the [previous section](#praefect). This document uses `gitaly-1`, - `gitaly-2`, and `gitaly-3` as Gitaly storage names. + `gitaly-2`, and `gitaly-3` as physical storage names. For more information on Gitaly server configuration, see our [Gitaly documentation](configure_gitaly.md#configure-gitaly-servers). diff --git a/doc/administration/repository_storage_types.md b/doc/administration/repository_storage_types.md index e1512038286f5a3270ce8cb636eb4e89c5226055..6e47d3099bd7757033b055f65519303177debb2c 100644 --- a/doc/administration/repository_storage_types.md +++ b/doc/administration/repository_storage_types.md @@ -29,9 +29,7 @@ The repository storage types documented here apply to any repository storage def ## Hashed storage -> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/28283) in GitLab 10.0. -> - Made the default for new installations in GitLab 12.0. -> - Enabled by default for new and renamed projects in GitLab 13.0. +> **Storage name** field [renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128416) from **Gitaly storage name** and **Relative path** field [renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128416) from **Gitaly relative path** in GitLab 16.3. Hashed storage stores projects on disk in a location based on a hash of the project's ID. Hashed storage is different to [legacy storage](#legacy-storage) where a project is stored based on: @@ -81,12 +79,11 @@ To look up a project's hash path in the Admin Area: 1. On the left sidebar, expand the top-most chevron (**{chevron-down}**). 1. Select **Admin Area**. 1. On the left sidebar, select **Overview > Projects** and select the project. +1. Locate the **Relative path** field. The value is similar to: -The **Gitaly relative path** is displayed there and looks similar to: - -```plaintext -"@hashed/b1/7e/b17ef6d19c7a5b1ee83b907c595526dcb1eb06db8227d650d5dda0a9f4ce8cd9.git" -``` + ```plaintext + "@hashed/b1/7e/b17ef6d19c7a5b1ee83b907c595526dcb1eb06db8227d650d5dda0a9f4ce8cd9.git" + ``` To look up a project's hash path using a Rails console: @@ -100,7 +97,7 @@ To look up a project's hash path using a Rails console: #### From hashed path to project name -Administrators can look up a project's name from its hashed storage path using: +Administrators can look up a project's name from its hashed relative path using: - A Rails console. - The `config` file in the `*.git` directory. diff --git a/doc/administration/server_hooks.md b/doc/administration/server_hooks.md index 8236058150470b6563e67da23ad9e258b6fb8999..e2f08f548e65f0d6d3c5378fad4f4d67549af264 100644 --- a/doc/administration/server_hooks.md +++ b/doc/administration/server_hooks.md @@ -74,7 +74,8 @@ To create server hooks for a repository: 1. On the left sidebar, expand the top-most chevron (**{chevron-down}**). 1. Select **Admin Area**. 1. Go to **Overview > Projects** and select the project you want to add a server hook to. -1. On the page that appears, locate the value of **Gitaly relative path**. This path is where server hooks must be located. +1. On the page that appears, locate the value of **Relative path**. This path is where server + hooks must be located. - If you are using [hashed storage](repository_storage_types.md#hashed-storage), see [Translate hashed storage paths](repository_storage_types.md#translate-hashed-storage-paths) for information on interpreting the relative path. diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md index b983002dbed53ab8ffd4f79d99f4fcc553e7f868..d65df0b56c8a155c316336c96e58a7634c196df6 100644 --- a/doc/development/documentation/styleguide/word_list.md +++ b/doc/development/documentation/styleguide/word_list.md @@ -1424,6 +1424,17 @@ Instead of **and/or**, use **or** or re-write the sentence. This rule also appli Do not use **slave**. Another option is **secondary**. ([Vale](../testing.md#vale) rule: [`InclusionCultural.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/InclusionCultural.yml)) +## storages + +In the context of: + +- Gitaly, storage is physical and must be called a **storage**. +- Gitaly Cluster, storage can be either: + - Virtual and must be called a **virtual storage**. + - Physical and must be called a **physical storage**. + +Gitaly storages have physical paths and virtual storages have virtual paths. + ## subgroup Use **subgroup** (no hyphen) instead of **sub-group**. ([Vale](../testing.md#vale) rule: [`SubstitutionSuggestions.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/SubstitutionSuggestions.yml)) diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md index 6013abc4892ae71c398a88d834fc827b8040fcaf..ea5e3f20b3a6668cb433b764784858d830b8ee48 100644 --- a/doc/user/project/issues/design_management.md +++ b/doc/user/project/issues/design_management.md @@ -44,7 +44,7 @@ For a video overview, see [Design Management (GitLab 12.2)](https://www.youtube. A GitLab administrator can verify the storage type of a project by going to **Admin Area > Projects** and then selecting the project in question. A project can be identified as - hashed-stored if its **Gitaly relative path** contains `@hashed`. + hashed-stored if the value of the **Relative path** field contains `@hashed`. If the requirements are not met, you are notified in the **Designs** section. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 8d3af341a653b6e85e264d2b1e45d43082eec720..34885737818dc66ceee4f1cf1ba5bb81847812bd 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -21457,12 +21457,6 @@ msgstr "" msgid "Gitaly Servers" msgstr "" -msgid "Gitaly relative path:" -msgstr "" - -msgid "Gitaly storage name:" -msgstr "" - msgid "Gitaly timeouts" msgstr "" @@ -36894,6 +36888,12 @@ msgstr "" msgid "ProjectSettings|Flexible tool to collaboratively develop ideas and plan work in this project." msgstr "" +msgid "ProjectSettings|For Gitaly, location of data on the storage. For Gitaly Cluster, location of data on the virtual storage." +msgstr "" + +msgid "ProjectSettings|For Gitaly, name of the storage that stores the repository. For Gitaly Cluster, name of the virtual storage that stores the repository." +msgstr "" + msgid "ProjectSettings|Forks" msgstr "" @@ -37029,6 +37029,9 @@ msgstr "" msgid "ProjectSettings|Publish, store, and view packages in a project." msgstr "" +msgid "ProjectSettings|Relative path:" +msgstr "" + msgid "ProjectSettings|Releases" msgstr "" @@ -37101,6 +37104,9 @@ msgstr "" msgid "ProjectSettings|Status checks must succeed" msgstr "" +msgid "ProjectSettings|Storage name:" +msgstr "" + msgid "ProjectSettings|Store custom configuration files." msgstr ""