summaryrefslogtreecommitdiff
path: root/doc/development/scalability.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-11 21:08:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-11 21:08:44 +0000
commit0e9eea40b62fcae67b2bd885dbedd7525fbca3c7 (patch)
tree099467fd4c16441f60a879239056b235c7fdabdc /doc/development/scalability.md
parent1ca9950d5f890cd8f185e1eda158b969a7244fe2 (diff)
downloadgitlab-ce-0e9eea40b62fcae67b2bd885dbedd7525fbca3c7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/scalability.md')
-rw-r--r--doc/development/scalability.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/scalability.md b/doc/development/scalability.md
index d4772bf3ea5..37ffdbdbfde 100644
--- a/doc/development/scalability.md
+++ b/doc/development/scalability.md
@@ -165,7 +165,7 @@ and secondaries are set up a bit differently:
For replicas, colocating is advantageous because it reduces network hops
and hence latency. However, for the primary, colocating is
disadvantageous because PgBouncer would become a single point of failure
-and cause errors. When a failover occurs, one of two things could
+and cause errors. When a failover occurs, one of two things could
happen:
- The primary disappears from the network.
@@ -212,7 +212,7 @@ Redis process.
#### High availability/Risks
Single-core: Like PgBouncer, a single Redis process can only use one
-core. It does not support multi-threading.
+core. It does not support multi-threading.
Dumb secondaries: Redis secondaries (aka slaves) don't actually
handle any load. Unlike PostgreSQL secondaries, they don't even serve