Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
62b0eb2c
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
62b0eb2c
编写于
5月 08, 2017
作者:
S
Sean Packham (GitLab)
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'lm-improve-HA-docs' into 'master'
clarify DB/Redis HA docs See merge request !11094
上级
6386e42f
a39adfb4
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
11 addition
and
10 deletion
+11
-10
doc/administration/high_availability/database.md
doc/administration/high_availability/database.md
+3
-1
doc/administration/high_availability/redis.md
doc/administration/high_availability/redis.md
+8
-9
未找到文件。
doc/administration/high_availability/database.md
浏览文件 @
62b0eb2c
...
...
@@ -27,7 +27,7 @@ If you use a cloud-managed service, or provide your own PostgreSQL:
steps on the download page.
1.
Create/edit
`/etc/gitlab/gitlab.rb`
and use the following configuration.
Be sure to change the
`external_url`
to match your eventual GitLab front-end
URL.
URL.
If there is a directive listed below that you do not see in the configuration, be sure to add it.
```ruby
external_url 'https://gitlab.example.com'
...
...
@@ -39,6 +39,8 @@ If you use a cloud-managed service, or provide your own PostgreSQL:
unicorn['enable'] = false
sidekiq['enable'] = false
redis['enable'] = false
prometheus['enable'] = false
gitaly['enable'] = false
gitlab_workhorse['enable'] = false
mailroom['enable'] = false
...
...
doc/administration/high_availability/redis.md
浏览文件 @
62b0eb2c
...
...
@@ -42,10 +42,10 @@ instances run in different machines. If you fail to provision the machines in
that specific way, any issue with the shared environment can bring your entire
setup down.
It is OK to run a Sentinel along
with
a master or slave Redis instance.
No more than one Sentinel i
n the same machine though.
It is OK to run a Sentinel along
side of
a master or slave Redis instance.
There should be no more than one Sentinel o
n the same machine though.
You also need to take in consideration the underlying network topology,
You also need to take in
to
consideration the underlying network topology,
making sure you have redundant connectivity between Redis / Sentinel and
GitLab instances, otherwise the networks will become a single point of
failure.
...
...
@@ -113,7 +113,7 @@ the Omnibus GitLab package in `5` **independent** machines, both with
### Redis setup overview
You must have at least
`3`
Redis servers:
`1`
Master,
`2`
Slaves, and they
need to
be each in a independent machine
(see explanation above).
need to
each be on independent machines
(see explanation above).
You can have additional Redis nodes, that will help survive a situation
where more nodes goes down. Whenever there is only
`2`
nodes online, a failover
...
...
@@ -232,7 +232,7 @@ Pick the one that suits your needs.
This is the section where we install and setup the new Redis instances.
>**Notes:**
-
We assume that you
install
GitLab and all HA components from scratch. If you
-
We assume that you
have installed
GitLab and all HA components from scratch. If you
already have it installed and running, read how to
[
switch from a single-machine installation to Redis HA
](
#switching-from-an-existing-single-machine-installation-to-redis-ha
)
.
-
Redis nodes (both master and slaves) will need the same password defined in
...
...
@@ -245,10 +245,9 @@ The prerequisites for a HA Redis setup are the following:
1.
Provision the minimum required number of instances as specified in the
[
recommended setup
](
#recommended-setup
)
section.
1.
**Do NOT**
install Redis or Redis Sentinel in the same machines your
GitLab application is running on. You can however opt in to install Redis
and Sentinel in the same machine (each in independent ones is recommended
though).
1.
We
**Do not**
recommend installing Redis or Redis Sentinel in the same machines your
GitLab application is running on as this weakens your HA configuration. You can however opt in to install Redis
and Sentinel in the same machine.
1.
All Redis nodes must be able to talk to each other and accept incoming
connections over Redis (
`6379`
) and Sentinel (
`26379`
) ports (unless you
change the default ones).
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录