summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-07-15 13:49:33 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-07-15 13:49:33 +0000
commit4d8babc809ebd13e4f583d5244a97b2955fd4af5 (patch)
tree6111b9272649804184220a0aaaad6105a044f387
parent29662cdce3b7a4728ecd98c8e31c99d97473e483 (diff)
parenta45c5e185879b390345ac363e1e26def00dd1a3f (diff)
downloadgitlab-ce-4d8babc809ebd13e4f583d5244a97b2955fd4af5.tar.gz
Merge branch 'add-geo-database-ugprade-docs' into 'master'
Add note to GEO documentation about database upgrade See merge request gitlab-org/gitlab-ce!30647
-rw-r--r--doc/administration/geo/replication/updating_the_geo_nodes.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/administration/geo/replication/updating_the_geo_nodes.md b/doc/administration/geo/replication/updating_the_geo_nodes.md
index c27f6c78455..166ee94eca4 100644
--- a/doc/administration/geo/replication/updating_the_geo_nodes.md
+++ b/doc/administration/geo/replication/updating_the_geo_nodes.md
@@ -14,6 +14,16 @@ all you need to do is update GitLab itself:
the tracking database is enabled.
1. [Test](#check-status-after-updating) **primary** and **secondary** nodes, and check version in each.
+## 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.
+
+This can be temporarily disabled by running the following before ugprading:
+
+```sh
+sudo touch /etc/gitlab/disable-postgresql-upgrade
+```
+
## Upgrading to GitLab 10.8
Before 10.8, broadcast messages would not propagate without flushing the cache on the **secondary** nodes. This has been fixed in 10.8, but requires one last cache flush on each **secondary** node: