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
871ea5e0
Commit
871ea5e0
authored
May 05, 2019
by
Marcel Amirault
Committed by
Achilleas Pipinellis
May 05, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Docs: (EE Port) Merge EE doc/administration/high_availability to CE
parent
151ed9bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
doc/administration/high_availability/README.md
doc/administration/high_availability/README.md
+5
-5
doc/administration/high_availability/database.md
doc/administration/high_availability/database.md
+2
-2
doc/administration/high_availability/pgbouncer.md
doc/administration/high_availability/pgbouncer.md
+1
-0
No files found.
doc/administration/high_availability/README.md
View file @
871ea5e0
...
...
@@ -69,8 +69,8 @@ larger one.
#### Installation Instructions
Complete the following installation steps in order. A link at the end of each
section will bring you back to the Scalable Architecture Examples section so
Complete the following installation steps in order. A link at the end of each
section will bring you back to the Scalable Architecture Examples section so
you can continue with the next step.
1.
[
PostgreSQL
](
./database.md#postgresql-in-a-scaled-environment
)
...
...
@@ -135,7 +135,7 @@ the contention.
-
2 or more GitLab application nodes (Unicorn, Workhorse, Sidekiq, PGBouncer)
-
1 NFS/Gitaly server
![
Horizontal architecture diagram
](
..
/img/high_availability/horizontal.png
)
![
Horizontal architecture diagram
](
https://docs.gitlab.com/ee/administration
/img/high_availability/horizontal.png
)
### Hybrid
...
...
@@ -151,7 +151,7 @@ contention due to certain workloads.
-
2 or more Web nodes (Unicorn, Workhorse, PGBouncer)
-
1 or more NFS/Gitaly servers
![
Hybrid architecture diagram
](
..
/img/high_availability/hybrid.png
)
![
Hybrid architecture diagram
](
https://docs.gitlab.com/ee/administration
/img/high_availability/hybrid.png
)
### Fully Distributed
...
...
@@ -170,7 +170,7 @@ with the added complexity of many more nodes to configure, manage and monitor.
-
2 or more Web nodes (All other web requests)
-
2 or more NFS/Gitaly servers
![
Fully Distributed architecture diagram
](
..
/img/high_availability/fully-distributed.png
)
![
Fully Distributed architecture diagram
](
https://docs.gitlab.com/ee/administration
/img/high_availability/fully-distributed.png
)
The following pages outline the steps necessary to configure each component
separately:
...
...
doc/administration/high_availability/database.md
View file @
871ea5e0
...
...
@@ -98,9 +98,9 @@ environments including [Horizontal](./README.md#horizontal),
### Provide your own PostgreSQL instance **[CORE ONLY]**
If you want to use your own deployed PostgreSQL instance(s),
If you want to use your own deployed PostgreSQL instance(s),
see
[
Provide your own PostgreSQL instance
](
#provide-your-own-postgresql-instance-core-only
)
for more details. However, you can use the GitLab Omnibus package to easily
for more details. However, you can use the GitLab Omnibus package to easily
deploy the bundled PostgreSQL.
### High Availability with GitLab Omnibus **[PREMIUM ONLY]**
...
...
doc/administration/high_availability/pgbouncer.md
View file @
871ea5e0
...
...
@@ -13,6 +13,7 @@ It is recommended to run pgbouncer alongside the `gitlab-rails` service, or on i
## Operations
### Running Pgbouncer as part of an HA GitLab installation
See our
[
HA documentation for PostgreSQL
](
database.md
)
for information on running pgbouncer as part of a HA setup
### Running Pgbouncer as part of a non-HA GitLab installation
...
...
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