Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
42adc0f3
Commit
42adc0f3
authored
Apr 22, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Geo documentation to use `primary` and `secondary` terminology.
parent
27d7a37c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
doc/gitlab-geo/README.md
doc/gitlab-geo/README.md
+1
-1
doc/gitlab-geo/configuration.md
doc/gitlab-geo/configuration.md
+2
-2
doc/gitlab-geo/database.md
doc/gitlab-geo/database.md
+5
-4
No files found.
doc/gitlab-geo/README.md
View file @
42adc0f3
...
...
@@ -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
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
After you set up the database replication and configure the GitLab Geo nodes,
there are a few things to consider:
...
...
doc/gitlab-geo/configuration.md
View file @
42adc0f3
...
...
@@ -81,8 +81,8 @@ Host example.com # The FQDN of the primary Geo node
## Primary Node GitLab setup
>**Note:**
You will need to setup your database into a
**
Master <-> Slave
**
replication
topology, and your Primary node should always point to a database's
Master
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
Primary
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
...
...
doc/gitlab-geo/database.md
View file @
42adc0f3
...
...
@@ -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
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`
,
and the secondary ones which are read-only will act as
`slaves`
.
The GitLab primary node where the write operations happen will connect to
`primary`
database server, and the secondary ones which are read-only will
connect to
`secondary`
database servers (which are read-only too).
>**Note:**
To be on par with GitLab's notation, we will use
`primary`
to denote the
`master`
server, and
`secondary`
for the
`slave`
.
In many databases documentation you will see
`primary`
being references as
`master`
and
`secondary`
as either
`slave`
or
`standby`
server (read-only)
.
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment