From b0545a4bab9cbcefd2a0897b182521cd6bfa5600 Mon Sep 17 00:00:00 2001 From: Chloe Fons Date: Wed, 22 Oct 2025 11:38:19 +0100 Subject: [PATCH 1/5] Add explanation paragraph --- doc/administration/geo/replication/object_storage.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/administration/geo/replication/object_storage.md b/doc/administration/geo/replication/object_storage.md index 8416f97c1d77f6..d6d2c8e9316add 100644 --- a/doc/administration/geo/replication/object_storage.md +++ b/doc/administration/geo/replication/object_storage.md @@ -122,3 +122,11 @@ For manual synchronization, or scheduled by `cron`, see: - [`s3cmd sync`](https://s3tools.org/s3cmd-sync) - [`gsutil rsync`](https://cloud.google.com/storage/docs/gsutil/commands/rsync) + +## Disabled Verification + +As mentioned in introduction, verification of files stored in object storage was [introduced](https://gitlab.com/groups/gitlab-org/-/epics/8056) in GitLab 16.4 [with a flag](../../feature_flags/_index.md) named `geo_object_storage_verification`. This flag is enabled by default. +Verification of files stored in object storage can be disabled by tunring this flag off. This is however **not advised**, as turning this flag off will trigger the asynchronous deletion of all existing verification state records. + +When the `geo_object_storage_verification` feature flag is disabled, Geo verification workers (`Geo::VerificationBatchWorker`) may still be enqueued in Sidekiq logs, but this is expected behavior. This does not mean that verification is taking place. +Additionally, during the cleanup mentioned above, workers can get enqueued to process still remaining records. \ No newline at end of file -- GitLab From 1148639c82ab777e890ba42eec2a618143f62da7 Mon Sep 17 00:00:00 2001 From: Chloe Fons Date: Wed, 22 Oct 2025 11:42:20 +0100 Subject: [PATCH 2/5] Fix typo and redundant wording --- doc/administration/geo/replication/object_storage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/administration/geo/replication/object_storage.md b/doc/administration/geo/replication/object_storage.md index d6d2c8e9316add..e4bde3c7a3e0d8 100644 --- a/doc/administration/geo/replication/object_storage.md +++ b/doc/administration/geo/replication/object_storage.md @@ -126,7 +126,7 @@ For manual synchronization, or scheduled by `cron`, see: ## Disabled Verification As mentioned in introduction, verification of files stored in object storage was [introduced](https://gitlab.com/groups/gitlab-org/-/epics/8056) in GitLab 16.4 [with a flag](../../feature_flags/_index.md) named `geo_object_storage_verification`. This flag is enabled by default. -Verification of files stored in object storage can be disabled by tunring this flag off. This is however **not advised**, as turning this flag off will trigger the asynchronous deletion of all existing verification state records. +Verification of files stored in object storage can be disabled by turning this flag off. This is however **not advised**, as it will trigger the asynchronous deletion of all existing verification state records. When the `geo_object_storage_verification` feature flag is disabled, Geo verification workers (`Geo::VerificationBatchWorker`) may still be enqueued in Sidekiq logs, but this is expected behavior. This does not mean that verification is taking place. Additionally, during the cleanup mentioned above, workers can get enqueued to process still remaining records. \ No newline at end of file -- GitLab From 799600dd32cda96892bc12305f158a1cd8eb63a9 Mon Sep 17 00:00:00 2001 From: Chloe Fons Date: Wed, 22 Oct 2025 11:45:38 +0100 Subject: [PATCH 3/5] Add trailing new line --- doc/administration/geo/replication/object_storage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/administration/geo/replication/object_storage.md b/doc/administration/geo/replication/object_storage.md index e4bde3c7a3e0d8..d8efeecbcab80d 100644 --- a/doc/administration/geo/replication/object_storage.md +++ b/doc/administration/geo/replication/object_storage.md @@ -129,4 +129,4 @@ As mentioned in introduction, verification of files stored in object storage was Verification of files stored in object storage can be disabled by turning this flag off. This is however **not advised**, as it will trigger the asynchronous deletion of all existing verification state records. When the `geo_object_storage_verification` feature flag is disabled, Geo verification workers (`Geo::VerificationBatchWorker`) may still be enqueued in Sidekiq logs, but this is expected behavior. This does not mean that verification is taking place. -Additionally, during the cleanup mentioned above, workers can get enqueued to process still remaining records. \ No newline at end of file +Additionally, during the cleanup mentioned above, workers can get enqueued to process still remaining records. -- GitLab From e246f2b45828af033faea06f9f6d0ef9316c913b Mon Sep 17 00:00:00 2001 From: c_fons Date: Wed, 22 Oct 2025 12:52:02 +0200 Subject: [PATCH 4/5] Add newline char --- doc/administration/geo/replication/object_storage.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/administration/geo/replication/object_storage.md b/doc/administration/geo/replication/object_storage.md index d8efeecbcab80d..8277fdded474f8 100644 --- a/doc/administration/geo/replication/object_storage.md +++ b/doc/administration/geo/replication/object_storage.md @@ -128,5 +128,6 @@ For manual synchronization, or scheduled by `cron`, see: As mentioned in introduction, verification of files stored in object storage was [introduced](https://gitlab.com/groups/gitlab-org/-/epics/8056) in GitLab 16.4 [with a flag](../../feature_flags/_index.md) named `geo_object_storage_verification`. This flag is enabled by default. Verification of files stored in object storage can be disabled by turning this flag off. This is however **not advised**, as it will trigger the asynchronous deletion of all existing verification state records. -When the `geo_object_storage_verification` feature flag is disabled, Geo verification workers (`Geo::VerificationBatchWorker`) may still be enqueued in Sidekiq logs, but this is expected behavior. This does not mean that verification is taking place. +When the `geo_object_storage_verification` feature flag is disabled, Geo verification workers (`Geo::VerificationBatchWorker`) may still be enqueued in Sidekiq logs, but this is expected behavior. This does not mean that verification is taking place. + Additionally, during the cleanup mentioned above, workers can get enqueued to process still remaining records. -- GitLab From 2bb0605311365b6b32a6583c29cae36d106ea74f Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Thu, 23 Oct 2025 18:39:15 +0200 Subject: [PATCH 5/5] Move section higher in the doc --- .../geo/replication/object_storage.md | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/administration/geo/replication/object_storage.md b/doc/administration/geo/replication/object_storage.md index 8277fdded474f8..d74627eba7586d 100644 --- a/doc/administration/geo/replication/object_storage.md +++ b/doc/administration/geo/replication/object_storage.md @@ -42,6 +42,19 @@ To have: [Read more about using object storage with GitLab](../../object_storage.md). +## Object storage verification + +Geo verifies files stored in object storage to ensure data integrity between primary and secondary sites. + +{{< alert type="warning" >}} +Disabling object storage verification is not recommended. +When you disable the `geo_object_storage_verification` feature flag, GitLab asynchronously deletes all existing verification state records. +{{< /alert >}} + +When the `geo_object_storage_verification` feature flag is disabled: +- Geo verification workers (`Geo::VerificationBatchWorker`) can still appear in Sidekiq logs, but verification does not take place. +- During cleanup of verification records, workers may be enqueued to process remaining records. + ## Enabling GitLab-managed object storage replication {{< history >}} @@ -122,12 +135,3 @@ For manual synchronization, or scheduled by `cron`, see: - [`s3cmd sync`](https://s3tools.org/s3cmd-sync) - [`gsutil rsync`](https://cloud.google.com/storage/docs/gsutil/commands/rsync) - -## Disabled Verification - -As mentioned in introduction, verification of files stored in object storage was [introduced](https://gitlab.com/groups/gitlab-org/-/epics/8056) in GitLab 16.4 [with a flag](../../feature_flags/_index.md) named `geo_object_storage_verification`. This flag is enabled by default. -Verification of files stored in object storage can be disabled by turning this flag off. This is however **not advised**, as it will trigger the asynchronous deletion of all existing verification state records. - -When the `geo_object_storage_verification` feature flag is disabled, Geo verification workers (`Geo::VerificationBatchWorker`) may still be enqueued in Sidekiq logs, but this is expected behavior. This does not mean that verification is taking place. - -Additionally, during the cleanup mentioned above, workers can get enqueued to process still remaining records. -- GitLab