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
70f58427
Commit
70f58427
authored
Jun 08, 2018
by
Ash McKenzie
Committed by
Achilleas Pipinellis
Jun 08, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Geo: Improve no downtime upgrade documentation"
parent
fa41cf93
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
31 deletions
+39
-31
.gitlab-ci.yml
.gitlab-ci.yml
+2
-0
doc/administration/geo/replication/updating_the_geo_nodes.md
doc/administration/geo/replication/updating_the_geo_nodes.md
+24
-24
doc/update/README.md
doc/update/README.md
+13
-7
No files found.
.gitlab-ci.yml
View file @
70f58427
...
@@ -715,6 +715,8 @@ docs lint:
...
@@ -715,6 +715,8 @@ docs lint:
<<
:
*except-qa
<<
:
*except-qa
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
image
:
"
registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
stage
:
test
stage
:
test
variables
:
SETUP_DB
:
"
false"
cache
:
{}
cache
:
{}
dependencies
:
[]
dependencies
:
[]
before_script
:
[]
before_script
:
[]
...
...
doc/administration/geo/replication/updating_the_geo_nodes.md
View file @
70f58427
...
@@ -20,7 +20,7 @@ Before 10.8, broadcast messages would not propagate without flushing the cache o
...
@@ -20,7 +20,7 @@ Before 10.8, broadcast messages would not propagate without flushing the cache o
This has been fixed in 10.8, but requires one last cache flush on each secondary node:
This has been fixed in 10.8, but requires one last cache flush on each secondary node:
```
bash
```
bash
gitlab-rake cache:clear
sudo
gitlab-rake cache:clear
```
```
## Upgrading to GitLab 10.6
## Upgrading to GitLab 10.6
...
@@ -59,8 +59,8 @@ authentication method.
...
@@ -59,8 +59,8 @@ authentication method.
1.
**[primary]**
Reconfigure and restart
1.
**[primary]**
Reconfigure and restart
```bash
```bash
gitlab-ctl reconfigure
sudo
gitlab-ctl reconfigure
gitlab-ctl restart
sudo
gitlab-ctl restart
```
```
1.
**[secondary]**
Login to all secondary nodes and edit
`/etc/gitlab/gitlab.rb`
:
1.
**[secondary]**
Login to all secondary nodes and edit
`/etc/gitlab/gitlab.rb`
:
...
@@ -89,8 +89,8 @@ authentication method.
...
@@ -89,8 +89,8 @@ authentication method.
1.
**[secondary]**
Reconfigure and restart
1.
**[secondary]**
Reconfigure and restart
```bash
```bash
gitlab-ctl reconfigure
sudo
gitlab-ctl reconfigure
gitlab-ctl restart
sudo
gitlab-ctl restart
```
```
## Upgrading to GitLab 10.5
## Upgrading to GitLab 10.5
...
@@ -206,7 +206,7 @@ following to clean this up.
...
@@ -206,7 +206,7 @@ following to clean this up.
On the SECONDARY Geo nodes, run as root:
On the SECONDARY Geo nodes, run as root:
```
sh
```
ba
sh
mv
/var/opt/gitlab/gitlab-rails/working /var/opt/gitlab/gitlab-rails/working.old
mv
/var/opt/gitlab/gitlab-rails/working /var/opt/gitlab/gitlab-rails/working.old
mkdir
/var/opt/gitlab/gitlab-rails/working
mkdir
/var/opt/gitlab/gitlab-rails/working
chmod
700 /var/opt/gitlab/gitlab-rails/working
chmod
700 /var/opt/gitlab/gitlab-rails/working
...
@@ -218,7 +218,7 @@ You may delete `/var/opt/gitlab/gitlab-rails/working.old` any time.
...
@@ -218,7 +218,7 @@ You may delete `/var/opt/gitlab/gitlab-rails/working.old` any time.
Once this is done, we advise restarting GitLab on the secondary nodes for the
Once this is done, we advise restarting GitLab on the secondary nodes for the
new working directory to be used:
new working directory to be used:
```
```
bash
sudo
gitlab-ctl restart
sudo
gitlab-ctl restart
```
```
...
@@ -267,7 +267,7 @@ is prepended with the relevant node for better clarity:
...
@@ -267,7 +267,7 @@ is prepended with the relevant node for better clarity:
1.
**[secondary]**
Make a backup of the
`recovery.conf`
file on
**all**
1.
**[secondary]**
Make a backup of the
`recovery.conf`
file on
**all**
secondary nodes to preserve PostgreSQL's credentials:
secondary nodes to preserve PostgreSQL's credentials:
```
```
bash
sudo cp /var/opt/gitlab/postgresql/data/recovery.conf /var/opt/gitlab/
sudo cp /var/opt/gitlab/postgresql/data/recovery.conf /var/opt/gitlab/
```
```
...
@@ -279,7 +279,7 @@ is prepended with the relevant node for better clarity:
...
@@ -279,7 +279,7 @@ is prepended with the relevant node for better clarity:
stop all services except
`postgresql`
as we will use it to re-initialize the
stop all services except
`postgresql`
as we will use it to re-initialize the
secondary node's database:
secondary node's database:
```
```
bash
sudo gitlab-ctl stop
sudo gitlab-ctl stop
sudo gitlab-ctl start postgresql
sudo gitlab-ctl start postgresql
```
```
...
@@ -288,19 +288,19 @@ is prepended with the relevant node for better clarity:
...
@@ -288,19 +288,19 @@ is prepended with the relevant node for better clarity:
1. **[secondary]** Stop all services:
1. **[secondary]** Stop all services:
```
```
bash
sudo gitlab-ctl stop
sudo gitlab-ctl stop
```
```
1. **[secondary]** Prevent running database migrations:
1. **[secondary]** Prevent running database migrations:
```
```
bash
sudo touch /etc/gitlab/skip-auto-migrations
sudo touch /etc/gitlab/skip-auto-migrations
```
```
1. **[secondary]** Move the old database to another directory:
1. **[secondary]** Move the old database to another directory:
```
```
bash
sudo mv /var/opt/gitlab/postgresql{,.bak}
sudo mv /var/opt/gitlab/postgresql{,.bak}
```
```
...
@@ -309,26 +309,26 @@ is prepended with the relevant node for better clarity:
...
@@ -309,26 +309,26 @@ is prepended with the relevant node for better clarity:
1. **[secondary]** Make sure all services are up:
1. **[secondary]** Make sure all services are up:
```
```
bash
sudo gitlab-ctl start
sudo gitlab-ctl start
```
```
1. **[secondary]** Reconfigure GitLab:
1. **[secondary]** Reconfigure GitLab:
```
```
bash
sudo gitlab-ctl reconfigure
sudo gitlab-ctl reconfigure
```
```
1. **[secondary]** Run the PostgreSQL upgrade command:
1. **[secondary]** Run the PostgreSQL upgrade command:
```
```bash
sudo gitlab-ctl pg-upgrade
sudo gitlab-ctl pg-upgrade
```
```
1. **[secondary]** See the stored credentials for the database that you will
1. **[secondary]** See the stored credentials for the database that you will
need to re-initialize the replication:
need to re-initialize the replication:
```
```
bash
sudo grep -s primary_conninfo /var/opt/gitlab/recovery.conf
sudo grep -s primary_conninfo /var/opt/gitlab/recovery.conf
```
```
...
@@ -338,19 +338,19 @@ is prepended with the relevant node for better clarity:
...
@@ -338,19 +338,19 @@ is prepended with the relevant node for better clarity:
1. **[secondary]** Run the recovery script using the credentials from the
1. **[secondary]** Run the recovery script using the credentials from the
previous step:
previous step:
```
```
bash
sudo bash /tmp/replica.sh
sudo bash /tmp/replica.sh
```
```
1. **[secondary]** Reconfigure GitLab:
1. **[secondary]** Reconfigure GitLab:
```
```
bash
sudo gitlab-ctl reconfigure
sudo gitlab-ctl reconfigure
```
```
1. **[secondary]** Start all services:
1. **[secondary]** Start all services:
```
```
bash
sudo gitlab-ctl start
sudo gitlab-ctl start
```
```
...
@@ -359,7 +359,7 @@ is prepended with the relevant node for better clarity:
...
@@ -359,7 +359,7 @@ is prepended with the relevant node for better clarity:
1.
**[primary]**
After all secondaries are updated, start all services in
1.
**[primary]**
After all secondaries are updated, start all services in
primary:
primary:
```
```
bash
sudo gitlab-ctl start
sudo gitlab-ctl start
```
```
...
@@ -370,7 +370,7 @@ everything is working correctly:
...
@@ -370,7 +370,7 @@ everything is working correctly:
1.
Run the Geo raketask on all nodes, everything should be green:
1.
Run the Geo raketask on all nodes, everything should be green:
```
```
bash
sudo gitlab-rake gitlab:geo:check
sudo gitlab-rake gitlab:geo:check
```
```
...
@@ -386,7 +386,7 @@ and it is required since 10.0.
...
@@ -386,7 +386,7 @@ and it is required since 10.0.
1.
Run database migrations on tracking database
1.
Run database migrations on tracking database
```
```
bash
sudo gitlab-rake geo:db:migrate
sudo gitlab-rake geo:db:migrate
```
```
...
...
doc/update/README.md
View file @
70f58427
...
@@ -5,15 +5,15 @@ update guides.
...
@@ -5,15 +5,15 @@ update guides.
There are currently 3 official ways to install GitLab:
There are currently 3 official ways to install GitLab:
-
Omnibus packages
-
[
Omnibus packages
](
#omnibus-packages
)
-
Source installation
-
[
Source installation
](
#installation-from-source
)
-
Docker installation
-
[
Docker installation
](
#installation-using-docker
)
Based on your installation, choose a section below that fits your needs.
Based on your installation, choose a section below that fits your needs.
## Omnibus Packages
## Omnibus Packages
-
The
[
Omnibus update guide
]
(
http://docs.gitlab.com/omnibus/update/README.html
)
-
The
[
Omnibus update guide
]
[
omni-update
]
contains the steps needed to update an Omnibus GitLab package.
contains the steps needed to update an Omnibus GitLab package.
## Installation from source
## Installation from source
...
@@ -30,7 +30,7 @@ Based on your installation, choose a section below that fits your needs.
...
@@ -30,7 +30,7 @@ Based on your installation, choose a section below that fits your needs.
GitLab provides official Docker images for both Community and Enterprise
GitLab provides official Docker images for both Community and Enterprise
editions. They are based on the Omnibus package and instructions on how to
editions. They are based on the Omnibus package and instructions on how to
update them are in
[
a separate document
][
omnidocker
]
.
update them are in
[
a separate document
][
omni
-
docker
]
.
## Upgrading without downtime
## Upgrading without downtime
...
@@ -96,6 +96,10 @@ migrations this could potentially lead to hours of downtime, depending on the
...
@@ -96,6 +96,10 @@ migrations this could potentially lead to hours of downtime, depending on the
size of your database. To work around this you will have to use PostgreSQL and
size of your database. To work around this you will have to use PostgreSQL and
meet the other online upgrade requirements mentioned above.
meet the other online upgrade requirements mentioned above.
### Steps
Steps to
[
upgrade without downtime
][
omni-zero-downtime
]
.
## Upgrading between editions
## Upgrading between editions
GitLab comes in two flavors:
[
Community Edition
][
ce
]
which is MIT licensed,
GitLab comes in two flavors:
[
Community Edition
][
ce
]
which is MIT licensed,
...
@@ -136,10 +140,12 @@ possible.
...
@@ -136,10 +140,12 @@ possible.
-
[
Upgrading PostgreSQL Using Slony
](
upgrading_postgresql_using_slony.md
)
, for
-
[
Upgrading PostgreSQL Using Slony
](
upgrading_postgresql_using_slony.md
)
, for
upgrading a PostgreSQL database with minimal downtime.
upgrading a PostgreSQL database with minimal downtime.
[
omnidocker
]:
http://docs.gitlab.com/omnibus/docker/README.html
[
source-ee
]:
https://gitlab.com/gitlab-org/gitlab-ee/tree/master/doc/update
[
source-ee
]:
https://gitlab.com/gitlab-org/gitlab-ee/tree/master/doc/update
[
source-ce
]:
https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update
[
source-ce
]:
https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update
[
ee-ce
]:
../downgrade_ee_to_ce/README.md
[
ee-ce
]:
../downgrade_ee_to_ce/README.md
[
ce
]:
https://about.gitlab.com/features/#community
[
ce
]:
https://about.gitlab.com/features/#community
[
ee
]:
https://about.gitlab.com/features/#enterprise
[
ee
]:
https://about.gitlab.com/features/#enterprise
[
omni-ce-ee
]:
http://docs.gitlab.com/omnibus/update/README.html#from-community-edition-to-enterprise-edition
[
omni-ce-ee
]:
https://docs.gitlab.com/omnibus/update/README.html#updating-community-edition-to-enterprise-edition
[
omni-docker
]:
https://docs.gitlab.com/omnibus/docker/README.html
[
omni-update
]:
https://docs.gitlab.com/omnibus/update/README.html
[
omni-zero-downtime
]:
https://docs.gitlab.com/omnibus/update/README.html#zero-downtime-updates
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