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
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
Klaus Wölfel
slapos
Commits
bb253011
Commit
bb253011
authored
Feb 11, 2015
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5 mariadb resiliency import script: make sure the script does not run forever.
parent
bd10da56
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/template/instance-mariadb-resiliency-after-import-script.sh.in
...ate/instance-mariadb-resiliency-after-import-script.sh.in
+9
-1
No files found.
stack/erp5/buildout.cfg
View file @
bb253011
...
@@ -150,7 +150,7 @@ context =
...
@@ -150,7 +150,7 @@ context =
[mariadb-resiliency-after-import-script]
[mariadb-resiliency-after-import-script]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/template/instance-mariadb-resiliency-after-import-script.sh.in
url = ${:_profile_base_location_}/template/instance-mariadb-resiliency-after-import-script.sh.in
md5sum =
ea8ce40667827b16dbc642a73aca89f8
md5sum =
06882a0620e3b976c0fa212dc16fd9cf
mode = 755
mode = 755
[template-mariadb]
[template-mariadb]
...
...
stack/erp5/template/instance-mariadb-resiliency-after-import-script.sh.in
View file @
bb253011
...
@@ -46,9 +46,17 @@ trap "kill $mysqld_pid" EXIT TERM INT
...
@@ -46,9 +46,17 @@ trap "kill $mysqld_pid" EXIT TERM INT
sleep 30
sleep 30
# If mysql has stopped, abort
# If mysql has stopped, abort
if ! [ -d /proc/$mysql_pid ]; then
if ! [ -d /proc/$mysql_pid ]; then
echo "mysqld exited, aborting."
exit 1
fi
$instance_directory/etc/run/mariadb_update &
mariadb_update_pid=$!
sleep 60
# If mariadb_update is still running, abort
if [ -d /proc/$mariadb_update_pid ]; then
echo "mariadb_update still running after timeout, aborting."
exit 1
exit 1
fi
fi
$instance_directory/etc/run/mariadb_update
echo "Importing data..."
echo "Importing data..."
# Use latest dump XXX can contain funny characters
# Use latest dump XXX can contain funny characters
...
...
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