Commit 42adc0f3 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Update Geo documentation to use `primary` and `secondary` terminology.

parent 27d7a37c
...@@ -54,7 +54,7 @@ Geo instances. Follow the steps below in the order that they appear: ...@@ -54,7 +54,7 @@ Geo instances. Follow the steps below in the order that they appear:
1. Install GitLab Enterprise Edition on the server that will serve as the 1. Install GitLab Enterprise Edition on the server that will serve as the
secondary Geo node secondary Geo node
1. [Setup a database replication](./database.md) in `master <-> slave` topology 1. [Setup a database replication](./database.md) in `primary <-> secondary (read-only)` topology
1. [Configure GitLab](configuration.md) and set the primary and secondary nodes 1. [Configure GitLab](configuration.md) and set the primary and secondary nodes
After you set up the database replication and configure the GitLab Geo nodes, After you set up the database replication and configure the GitLab Geo nodes,
there are a few things to consider: there are a few things to consider:
......
...@@ -81,8 +81,8 @@ Host example.com # The FQDN of the primary Geo node ...@@ -81,8 +81,8 @@ Host example.com # The FQDN of the primary Geo node
## Primary Node GitLab setup ## Primary Node GitLab setup
>**Note:** >**Note:**
You will need to setup your database into a **Master <-> Slave** replication You will need to setup your database into a **Primary <-> Secondary (read-only)** replication
topology, and your Primary node should always point to a database's Master topology, and your Primary node should always point to a database's Primary
instance. If you haven't done that already, read [database replication](./database.md). instance. If you haven't done that already, read [database replication](./database.md).
Go to the server that you chose to be your primary, and visit Go to the server that you chose to be your primary, and visit
......
...@@ -4,12 +4,13 @@ This document describes the minimal steps you have to take in order to ...@@ -4,12 +4,13 @@ This document describes the minimal steps you have to take in order to
replicate your GitLab database into another server. You may have to change replicate your GitLab database into another server. You may have to change
some values according to your database setup, how big it is, etc. some values according to your database setup, how big it is, etc.
The GitLab primary node where the write operations happen will act as `master`, The GitLab primary node where the write operations happen will connect to
and the secondary ones which are read-only will act as `slaves`. `primary` database server, and the secondary ones which are read-only will
connect to `secondary` database servers (which are read-only too).
>**Note:** >**Note:**
To be on par with GitLab's notation, we will use `primary` to denote the `master` In many databases documentation you will see `primary` being references as `master`
server, and `secondary` for the `slave`. and `secondary` as either `slave` or `standby` server (read-only).
<!-- START doctoc generated TOC please keep comment here to allow auto update --> <!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE --> <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment