diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 06:08:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 06:08:58 +0000 |
| commit | 18b8435318887d3fc6e9f9d305967a953cdd7d3f (patch) | |
| tree | 28cb71f255eb364c224ff24dd085f8cd836951b1 /doc/administration/geo/disaster_recovery | |
| parent | 4359b9650ecf0960f04f0fd38fc25bec7b478a11 (diff) | |
| download | gitlab-ce-18b8435318887d3fc6e9f9d305967a953cdd7d3f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/geo/disaster_recovery')
| -rw-r--r-- | doc/administration/geo/disaster_recovery/background_verification.md | 2 | ||||
| -rw-r--r-- | doc/administration/geo/disaster_recovery/planned_failover.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/geo/disaster_recovery/background_verification.md b/doc/administration/geo/disaster_recovery/background_verification.md index c042e3e9872..322b3b3fe4d 100644 --- a/doc/administration/geo/disaster_recovery/background_verification.md +++ b/doc/administration/geo/disaster_recovery/background_verification.md @@ -176,7 +176,7 @@ progress to include them in [ee-1430]. For now, you can verify their integrity manually by following [these instructions][foreground-verification] on both nodes, and comparing the output between them. -In GitLab EE 12.1, Geo calculates checksums for attachments, LFS objects and +In GitLab EE 12.1, Geo calculates checksums for attachments, LFS objects, and archived traces on secondary nodes after the transfer, compares it with the stored checksums, and rejects transfers if mismatched. Please note that Geo currently does not support an automatic way to verify these data if they have diff --git a/doc/administration/geo/disaster_recovery/planned_failover.md b/doc/administration/geo/disaster_recovery/planned_failover.md index cd3d5a88de7..25050e4b13e 100644 --- a/doc/administration/geo/disaster_recovery/planned_failover.md +++ b/doc/administration/geo/disaster_recovery/planned_failover.md @@ -187,7 +187,7 @@ access to the **primary** node during the maintenance window. 1. On the **secondary** node, navigate to **Admin Area > Monitoring > Background Jobs > Queues** and wait for all the `geo` queues to drop to 0 queued and 0 running jobs. 1. On the **secondary** node, use [these instructions][foreground-verification] - to verify the integrity of CI artifacts, LFS objects and uploads in file + to verify the integrity of CI artifacts, LFS objects, and uploads in file storage. At this point, your **secondary** node will contain an up-to-date copy of everything the |