diff options
Diffstat (limited to 'doc/administration/geo/disaster_recovery/bring_primary_back.md')
| -rw-r--r-- | doc/administration/geo/disaster_recovery/bring_primary_back.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/administration/geo/disaster_recovery/bring_primary_back.md b/doc/administration/geo/disaster_recovery/bring_primary_back.md index dda2c5d34d3..fe05b52cec9 100644 --- a/doc/administration/geo/disaster_recovery/bring_primary_back.md +++ b/doc/administration/geo/disaster_recovery/bring_primary_back.md @@ -26,6 +26,16 @@ Alternatively, you can [set up a new **secondary** GitLab instance](../setup/ind To bring the former **primary** site up to date: 1. SSH into the former **primary** site that has fallen behind. +1. Remove `/etc/gitlab/gitlab-cluster.json` if it exists. + + If the site to be re-added as a **secondary** site was promoted with the `gitlab-ctl geo promote` command, then it may contain a `/etc/gitlab/gitlab-cluster.json` file. For example during `gitlab-ctl reconfigure`, you may notice output like: + + ```plaintext + The 'geo_primary_role' is defined in /etc/gitlab/gitlab-cluster.json as 'true' and overrides the setting in the /etc/gitlab/gitlab.rb + ``` + + If so, then `/etc/gitlab/gitlab-cluster.json` must be deleted from every Sidekiq, PostgreSQL, Gitaly, and Rails node in the site, to make `/etc/gitlab/gitlab.rb` the single source of truth again. + 1. Make sure all the services are up: ```shell |