From 9df379afd35d431286d8a634a9d8052ec8d96f78 Mon Sep 17 00:00:00 2001 From: Jessie Lee Date: Thu, 22 Jun 2023 17:26:46 +0000 Subject: [PATCH 1/5] Add Tracking Warning Praefect repositroy tracking is broken with praefect generated replica paths --- doc/administration/gitaly/recovery.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/administration/gitaly/recovery.md b/doc/administration/gitaly/recovery.md index dbbed0f60ba08d..dd4dcd71bea5a4 100644 --- a/doc/administration/gitaly/recovery.md +++ b/doc/administration/gitaly/recovery.md @@ -484,6 +484,10 @@ This command fails if: > [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6319) in GitLab 15.4. +WARNING: +Manually adding repositories to the tracking database does not currently work with Praefect-generated replica paths (`@cluster`). +The repository will not be given the correct relative repository path. + Migrations using the API automatically add repositories to the Praefect tracking database. If you are instead manually copying repositories over from existing infrastructure, you can use the `track-repositories` -- GitLab From 403f8de23601c39c914722d252c0cd6ac4604e7c Mon Sep 17 00:00:00 2001 From: jessie Date: Thu, 22 Jun 2023 13:59:17 -0400 Subject: [PATCH 2/5] Adjusting Warning Language --- doc/administration/gitaly/recovery.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/administration/gitaly/recovery.md b/doc/administration/gitaly/recovery.md index dd4dcd71bea5a4..84256f158203b9 100644 --- a/doc/administration/gitaly/recovery.md +++ b/doc/administration/gitaly/recovery.md @@ -485,8 +485,8 @@ This command fails if: > [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6319) in GitLab 15.4. WARNING: -Manually adding repositories to the tracking database does not currently work with Praefect-generated replica paths (`@cluster`). -The repository will not be given the correct relative repository path. +Manually adding repositories to the tracking database is broken with Praefect-generated replica paths (`@cluster`). +The repository will not be given the correct relative repository path. Migrations using the API automatically add repositories to the Praefect tracking database. -- GitLab From a548ce038cd72bf88ce6cd8d464340b649a50061 Mon Sep 17 00:00:00 2001 From: jessie Date: Thu, 22 Jun 2023 16:34:10 -0400 Subject: [PATCH 3/5] Adding Warning to single add --- doc/administration/gitaly/recovery.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/administration/gitaly/recovery.md b/doc/administration/gitaly/recovery.md index 84256f158203b9..82d6b043dad52e 100644 --- a/doc/administration/gitaly/recovery.md +++ b/doc/administration/gitaly/recovery.md @@ -429,6 +429,10 @@ sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.t ### Manually add a single repository to the tracking database +WARNING: +Manually adding repositories to the tracking database is broken with Praefect-generated replica paths (`@cluster`). +The repository will not be given the correct relative repository path. + > - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5658) in GitLab 14.4. > - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5789) in GitLab 14.6, support for immediate replication. -- GitLab From 364283d8eee2dfada5c73a0f5ce6fe45216e6c9c Mon Sep 17 00:00:00 2001 From: jessie Date: Thu, 22 Jun 2023 16:55:06 -0400 Subject: [PATCH 4/5] Switching the tense --- doc/administration/gitaly/recovery.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/administration/gitaly/recovery.md b/doc/administration/gitaly/recovery.md index 82d6b043dad52e..2c28cff12df17c 100644 --- a/doc/administration/gitaly/recovery.md +++ b/doc/administration/gitaly/recovery.md @@ -431,7 +431,7 @@ sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.t WARNING: Manually adding repositories to the tracking database is broken with Praefect-generated replica paths (`@cluster`). -The repository will not be given the correct relative repository path. +The repository is not given the correct relative repository path. > - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5658) in GitLab 14.4. > - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5789) in GitLab 14.6, support for immediate replication. @@ -490,7 +490,7 @@ This command fails if: WARNING: Manually adding repositories to the tracking database is broken with Praefect-generated replica paths (`@cluster`). -The repository will not be given the correct relative repository path. +The repository is not given the correct relative repository path. Migrations using the API automatically add repositories to the Praefect tracking database. -- GitLab From a4f1ecf533e253a5f73565dd7a9d8097109a5de5 Mon Sep 17 00:00:00 2001 From: Phillip Wells Date: Mon, 26 Jun 2023 17:33:07 +0000 Subject: [PATCH 5/5] Moving to Below Version --- doc/administration/gitaly/recovery.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/administration/gitaly/recovery.md b/doc/administration/gitaly/recovery.md index 2c28cff12df17c..980b4c89145c86 100644 --- a/doc/administration/gitaly/recovery.md +++ b/doc/administration/gitaly/recovery.md @@ -429,13 +429,13 @@ sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.t ### Manually add a single repository to the tracking database +> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5658) in GitLab 14.4. +> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5789) in GitLab 14.6, support for immediate replication. + WARNING: Manually adding repositories to the tracking database is broken with Praefect-generated replica paths (`@cluster`). The repository is not given the correct relative repository path. -> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5658) in GitLab 14.4. -> - [Introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5789) in GitLab 14.6, support for immediate replication. - The `track-repository` Praefect sub-command adds repositories on disk to the Praefect tracking database to be tracked. ```shell -- GitLab