Merge branch 'cat-merge-recordinvalid-troubleshooting-geo-docs' into 'master'

Consolidate duplicate promote error in Geo troubleshooting docs

See merge request gitlab-org/gitlab!44801

doc/administration/geo/disaster_recovery/index.md

@@ -98,16 +98,16 @@ must disable the **primary** node.
 
 Note the following when promoting a secondary:
 
-- If replication was paused on the secondary node, for example as a part of upgrading,
-  while you were running a version of GitLab lower than 13.4, you _must_
-  [enable the node via the database](../replication/troubleshooting.md#while-promoting-the-secondary-i-got-an-error-activerecordrecordinvalid)
+- If replication was paused on the secondary node (for example as a part of
+  upgrading, while you were running a version of GitLab earlier than 13.4), you
+  _must_ [enable the node by using the database](../replication/troubleshooting.md#message-activerecordrecordinvalid-validation-failed-enabled-geo-primary-node-cannot-be-disabled)
   before proceeding.
 - A new **secondary** should not be added at this time. If you want to add a new
   **secondary**, do this after you have completed the entire process of promoting
   the **secondary** to the **primary**.
 - If you encounter an `ActiveRecord::RecordInvalid: Validation failed: Name has already been taken`
-  error during this process, please read
-  [the troubleshooting advice](../replication/troubleshooting.md#fixing-errors-during-a-failover-or-when-promoting-a-secondary-to-a-primary-node).
+  error message during this process, for more information, see this
+  [troubleshooting advice](../replication/troubleshooting.md#fixing-errors-during-a-failover-or-when-promoting-a-secondary-to-a-primary-node).
 
 #### Promoting a **secondary** node running on a single machine
 

doc/administration/geo/replication/troubleshooting.md

@@ -614,46 +614,18 @@ or `gitlab-ctl promote-to-primary-node`, either:
 
 ### Message: ActiveRecord::RecordInvalid: Validation failed: Enabled Geo primary node cannot be disabled
 
-This error may occur if you have paused replication from the original primary node before attempting to promote this node.
-To double check this, you can do the following:
-
-- Get the current secondary node's ID using:
-
-  ```shell
-  sudo gitlab-rails runner 'puts GeoNode.current_node.id'
-  ```
-
-- Double check that the node is active through the database by running the following
-  on the secondary node, replacing `ID_FROM_ABOVE`:
-
-  ```shell
-  sudo gitlab-rails dbconsole
-
-  SELECT enabled FROM geo_nodes WHERE id = ID_FROM_ABOVE;
-  ```
-
-- If the above returned `f` it means that the replication was paused.
-  You can re-enable it through an `UPDATE` statement in the database:
-
-  ```shell
-  sudo gitlab-rails dbconsole
-
-  UPDATE geo_nodes SET enabled = 't' WHERE id = ID_FROM_ABOVE;
-  ```
-
-### While Promoting the secondary, I got an error `ActiveRecord::RecordInvalid`
-
 If you disabled a secondary node, either with the [replication pause task](../index.md#pausing-and-resuming-replication)
-(13.2) or via the UI (13.1 and earlier), you must first re-enable the
-node before you can continue. This is fixed in 13.4.
+(13.2) or by using the user interface (13.1 and earlier), you must first
+re-enable the node before you can continue. This is fixed in 13.4.
 
-From `gitlab-psql`, execute the following, replacing  `<your secondary url>`
-with the URL for your secondary server starting with `http` or `https` and ending with a `/`.
+Run the following command, replacing  `https://<secondary url>/` with the URL
+for your secondary server, using either `http` or `https`, and ensuring that you
+end the URL with a slash (`/`):
 
 ```shell
-SECONDARY_URL="https://<secondary url>/"
-DATABASE_NAME="gitlabhq_production"
-sudo gitlab-psql -d "$DATABASE_NAME" -c "UPDATE geo_nodes SET enabled = true WHERE url = '$SECONDARY_URL';"
+sudo gitlab-rails dbconsole
+
+UPDATE geo_nodes SET enabled = true WHERE url = 'https://<secondary url>/' AND enabled = false;"
 ```
 
 This should update 1 row.