提交 15c2e501 编写于 作者: E Evan Read

Merge branch 'brodock/fix-geo-upgrade-docs' into 'master'

Geo: Some update instructions should be for 9.0.x only

See merge request gitlab-org/gitlab-ce!31345
...@@ -10,10 +10,23 @@ all you need to do is update GitLab itself: ...@@ -10,10 +10,23 @@ all you need to do is update GitLab itself:
1. Log into each node (**primary** and **secondary** nodes). 1. Log into each node (**primary** and **secondary** nodes).
1. [Update GitLab][update]. 1. [Update GitLab][update].
1. [Update tracking database on **secondary** node](#update-tracking-database-on-secondary-node) when
the tracking database is enabled.
1. [Test](#check-status-after-updating) **primary** and **secondary** nodes, and check version in each. 1. [Test](#check-status-after-updating) **primary** and **secondary** nodes, and check version in each.
### Check status after updating
Now that the update process is complete, you may want to check whether
everything is working correctly:
1. Run the Geo raketask on all nodes, everything should be green:
```sh
sudo gitlab-rake gitlab:geo:check
```
1. Check the **primary** node's Geo dashboard for any errors.
1. Test the data replication by pushing code to the **primary** node and see if it
is received by **secondary** nodes.
## Upgrading to GitLab 12.1 ## Upgrading to GitLab 12.1
By default, GitLab 12.1 will attempt to automatically upgrade the embedded PostgreSQL server to 10.7 from 9.6. Please see [the omnibus documentation](https://docs.gitlab.com/omnibus/settings/database.html#upgrading-a-geo-instance) for the recommended procedure. By default, GitLab 12.1 will attempt to automatically upgrade the embedded PostgreSQL server to 10.7 from 9.6. Please see [the omnibus documentation](https://docs.gitlab.com/omnibus/settings/database.html#upgrading-a-geo-instance) for the recommended procedure.
...@@ -419,22 +432,7 @@ is prepended with the relevant node for better clarity: ...@@ -419,22 +432,7 @@ is prepended with the relevant node for better clarity:
sudo gitlab-ctl start sudo gitlab-ctl start
``` ```
## Check status after updating ### Update tracking database on **secondary** node
Now that the update process is complete, you may want to check whether
everything is working correctly:
1. Run the Geo raketask on all nodes, everything should be green:
```sh
sudo gitlab-rake gitlab:geo:check
```
1. Check the **primary** node's Geo dashboard for any errors.
1. Test the data replication by pushing code to the **primary** node and see if it
is received by **secondary** nodes.
## Update tracking database on **secondary** node
After updating a **secondary** node, you might need to run migrations on After updating a **secondary** node, you might need to run migrations on
the tracking database. The tracking database was added in GitLab 9.1, the tracking database. The tracking database was added in GitLab 9.1,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册