Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Blinov
slapos
Commits
941f58f2
Commit
941f58f2
authored
Nov 30, 2018
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gitlab: ensure all processes killed when resilient restore script exit
parent
c6119962
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
software/gitlab/software.cfg
software/gitlab/software.cfg
+1
-1
software/gitlab/template/template-gitlab-resiliency-restore.sh.in
.../gitlab/template/template-gitlab-resiliency-restore.sh.in
+3
-3
No files found.
software/gitlab/software.cfg
View file @
941f58f2
...
@@ -345,7 +345,7 @@ md5sum = 4e1ced687a86e4cfff2dde91237e3942
...
@@ -345,7 +345,7 @@ md5sum = 4e1ced687a86e4cfff2dde91237e3942
[template-gitlab-resiliency-restore.sh.in]
[template-gitlab-resiliency-restore.sh.in]
<= download-template
<= download-template
md5sum =
420d999daae050351a51487b9d2f8fe0
md5sum =
590fcadf26085fdd17487175bc0a469d
[unicorn.rb.in]
[unicorn.rb.in]
<= download-template
<= download-template
...
...
software/gitlab/template/template-gitlab-resiliency-restore.sh.in
View file @
941f58f2
...
@@ -69,7 +69,7 @@ trap "echo 'kill $postgres_pid" EXIT TERM INT
...
@@ -69,7 +69,7 @@ trap "echo 'kill $postgres_pid" EXIT TERM INT
echo "Starting Redis server..."
echo "Starting Redis server..."
$redis_executable &
$redis_executable &
redis_pid=$!
redis_pid=$!
trap "kill $redis_pid" EXIT TERM INT
trap "kill $
postgres_pid $
redis_pid" EXIT TERM INT
echo "[OK]"
echo "[OK]"
echo "Restoring gitlab data..."
echo "Restoring gitlab data..."
...
@@ -86,11 +86,11 @@ $promise_check/gitlab-app
...
@@ -86,11 +86,11 @@ $promise_check/gitlab-app
echo "Starting Unicorn to check gitlab-shell promise..."
echo "Starting Unicorn to check gitlab-shell promise..."
$unicorn_script &
$unicorn_script &
unicorn_pid=$!
unicorn_pid=$!
trap "kill $unicorn_pid" EXIT TERM INT
trap "kill $
postgres_pid $redis_pid $
unicorn_pid" EXIT TERM INT
sleep 60
sleep 60
if [ -s "$run_location/unicorn.pid" ]; then
if [ -s "$run_location/unicorn.pid" ]; then
unicorn_ppid=$(head -n 1 $run_location/unicorn.pid) > /dev/null 2>&1
unicorn_ppid=$(head -n 1 $run_location/unicorn.pid) > /dev/null 2>&1
trap "kill $unicorn_ppid" EXIT TERM INT
trap "kill $
postgres_pid $redis_pid $
unicorn_ppid" EXIT TERM INT
fi
fi
$promise_check/gitlab-shell
$promise_check/gitlab-shell
...
...
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