From 3c57df6d5af11603df78424ec6caa7e461072980 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 6 Nov 2020 10:03:22 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-5-stable-ee --- doc/administration/geo/disaster_recovery/index.md | 18 +++++++++--------- .../runbooks/planned_failover_multi_node.md | 11 ++++++----- doc/administration/geo/index.md | 5 +++-- .../geo/replication/updating_the_geo_nodes.md | 3 --- 4 files changed, 18 insertions(+), 19 deletions(-) (limited to 'doc') diff --git a/doc/administration/geo/disaster_recovery/index.md b/doc/administration/geo/disaster_recovery/index.md index 32b3558a51f..5876a8c36e6 100644 --- a/doc/administration/geo/disaster_recovery/index.md +++ b/doc/administration/geo/disaster_recovery/index.md @@ -133,9 +133,10 @@ Note the following when promoting a secondary: ``` 1. Promote the **secondary** node to the **primary** node. - -DANGER: **Danger:** -In GitLab 13.2 and later versions, promoting a secondary node to a primary while the secondary is paused fails. We are [investigating the issue](https://gitlab.com/gitlab-org/gitlab/-/issues/225173). Do not pause replication before promoting a secondary. If the node is paused, please resume before promoting. + CAUTION: **Caution:** + If the secondary node [has been paused](../../geo/index.md#pausing-and-resuming-replication), this performs + a point-in-time recovery to the last known state. + Data that was created on the primary while the secondary was paused will be lost. To promote the secondary node to primary along with preflight checks: @@ -166,14 +167,16 @@ conjunction with multiple servers, as it can only perform changes on a **secondary** with only a single machine. Instead, you must do this manually. -DANGER: **Danger:** -In GitLab 13.2 and later versions, promoting a secondary node to a primary while the secondary is paused fails. We are [investigating the issue](https://gitlab.com/gitlab-org/gitlab/-/issues/225173). Do not pause replication before promoting a secondary. If the node is paused, please resume before promoting. +CAUTION: **Caution:** +If the secondary node [has been paused](../../geo/index.md#pausing-and-resuming-replication), this performs +a point-in-time recovery to the last known state. +Data that was created on the primary while the secondary was paused will be lost. 1. SSH in to the database node in the **secondary** and trigger PostgreSQL to promote to read-write: ```shell - sudo gitlab-pg-ctl promote + sudo gitlab-ctl promote-db ``` In GitLab 12.8 and earlier, see [Message: `sudo: gitlab-pg-ctl: command not found`](../replication/troubleshooting.md#message-sudo-gitlab-pg-ctl-command-not-found). @@ -211,9 +214,6 @@ an external PostgreSQL database, as it can only perform changes on a **secondary node with GitLab and the database on the same machine. As a result, a manual process is required: -DANGER: **Danger:** -In GitLab 13.2 and later versions, promoting a secondary node to a primary while the secondary is paused fails. We are [investigating the issue](https://gitlab.com/gitlab-org/gitlab/-/issues/225173). Do not pause replication before promoting a secondary. If the node is paused, please resume before promoting. - 1. Promote the replica database associated with the **secondary** site. This will set the database to read-write: - Amazon RDS - [Promoting a Read Replica to Be a Standalone DB Instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_ReadRepl.html#USER_ReadRepl.Promote) diff --git a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md index 1e3bac0b354..c89b7929b13 100644 --- a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md +++ b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md @@ -227,14 +227,15 @@ conjunction with multiple servers, as it can only perform changes on a **secondary** with only a single machine. Instead, you must do this manually. -DANGER: **Danger:** -In GitLab 13.2 and later versions, promoting a secondary node to a primary while the secondary is paused fails. We are [investigating the issue](https://gitlab.com/gitlab-org/gitlab/-/issues/225173). Do not pause replication before promoting a secondary. If the node is paused, please resume before promoting. +CAUTION: **Caution:** + If the secondary node [has been paused](../../../geo/index.md#pausing-and-resuming-replication), this performs +a point-in-time recovery to the last known state. +Data that was created on the primary while the secondary was paused will be lost. -1. SSH in to the PostgreSQL node in the **secondary** and trigger PostgreSQL to - promote to read-write: +1. SSH in to the PostgreSQL node in the **secondary** and promote PostgreSQL separately: ```shell - sudo gitlab-pg-ctl promote + sudo gitlab-ctl promote-db ``` In GitLab 12.8 and earlier, see [Message: `sudo: gitlab-pg-ctl: command not found`](../../replication/troubleshooting.md#message-sudo-gitlab-pg-ctl-command-not-found). diff --git a/doc/administration/geo/index.md b/doc/administration/geo/index.md index 8767940816b..0bfdf1d2d65 100644 --- a/doc/administration/geo/index.md +++ b/doc/administration/geo/index.md @@ -195,8 +195,9 @@ For information on how to update your Geo nodes to the latest GitLab version, se > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/35913) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.2. -DANGER: **Danger:** -In GitLab 13.2 and later versions, promoting a secondary node to a primary while the secondary is paused fails. We are [investigating the issue](https://gitlab.com/gitlab-org/gitlab/-/issues/225173). Do not pause replication before promoting a secondary. If the node is paused, please resume before promoting. +CAUTION: **Caution:** +Pausing and resuming of replication is currently only supported for Geo installations using an +Omnibus GitLab-managed database. External databases are currently not supported. In some circumstances, like during [upgrades](replication/updating_the_geo_nodes.md) or a [planned failover](disaster_recovery/planned_failover.md), it is desirable to pause replication between the primary and secondary. diff --git a/doc/administration/geo/replication/updating_the_geo_nodes.md b/doc/administration/geo/replication/updating_the_geo_nodes.md index 1af2b8d0b88..55ddccb1d98 100644 --- a/doc/administration/geo/replication/updating_the_geo_nodes.md +++ b/doc/administration/geo/replication/updating_the_geo_nodes.md @@ -21,9 +21,6 @@ Updating Geo nodes involves performing: NOTE: **Note:** These general update steps are not intended for [high-availability deployments](https://docs.gitlab.com/omnibus/update/README.html#multi-node--ha-deployment), and will cause downtime. If you want to avoid downtime, consider using [zero downtime updates](https://docs.gitlab.com/omnibus/update/README.html#zero-downtime-updates). -DANGER: **Danger:** -In GitLab 13.2 and later versions, promoting a secondary node to a primary while the secondary is paused fails. We are [investigating the issue](https://gitlab.com/gitlab-org/gitlab/-/issues/225173). Do not pause replication before promoting a secondary. If the node is paused, please resume before promoting. - To update the Geo nodes when a new GitLab version is released, update **primary** and all **secondary** nodes: -- cgit v1.2.3