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
Iliya Manolov
slapos
Commits
5bde847f
Commit
5bde847f
authored
Feb 21, 2017
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack.erp5: Avoid duplicating mariadb service paths.
parent
f72859ce
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+1
-1
stack/erp5/instance-mariadb-resiliency-after-import-script.sh.in
...rp5/instance-mariadb-resiliency-after-import-script.sh.in
+4
-2
No files found.
stack/erp5/buildout.hash.cfg
View file @
5bde847f
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
# not need these here).
# not need these here).
[mariadb-resiliency-after-import-script]
[mariadb-resiliency-after-import-script]
filename = instance-mariadb-resiliency-after-import-script.sh.in
filename = instance-mariadb-resiliency-after-import-script.sh.in
md5sum =
d9eb111b6c1f3c8c63557a49c2358d09
md5sum =
394109d9373f4375d5e1599d5d1500ac
[template-mariadb]
[template-mariadb]
filename = instance-mariadb.cfg.in
filename = instance-mariadb.cfg.in
...
...
stack/erp5/instance-mariadb-resiliency-after-import-script.sh.in
View file @
5bde847f
...
@@ -18,6 +18,8 @@ mariadb_backup_directory='${directory:mariadb-backup-full}'
...
@@ -18,6 +18,8 @@ mariadb_backup_directory='${directory:mariadb-backup-full}'
instance_directory='${buildout:directory}'
instance_directory='${buildout:directory}'
pid_file='${my-cnf-parameters:pid-file}'
pid_file='${my-cnf-parameters:pid-file}'
binlog_path='${my-cnf-parameters:binlog-path}'
binlog_path='${my-cnf-parameters:binlog-path}'
server_executable='${mysqld:rendered}'
update_executable='${update-mysql:output}'
# Make sure mariadb is not already running
# Make sure mariadb is not already running
if [ -e "$pid_file" ]; then
if [ -e "$pid_file" ]; then
...
@@ -44,7 +46,7 @@ fi
...
@@ -44,7 +46,7 @@ fi
echo "Starting mariadb..."
echo "Starting mariadb..."
# XXX hardcoded
# XXX hardcoded
$instance_directory/etc/run/mariadb
&
"$server_executable" --innodb-flush-method=nosync --skip-innodb-doublewrite
&
mysqld_pid=$!
mysqld_pid=$!
trap "kill $mysqld_pid" EXIT TERM INT
trap "kill $mysqld_pid" EXIT TERM INT
sleep 30
sleep 30
...
@@ -53,7 +55,7 @@ if ! [ -d /proc/$mysql_pid ]; then
...
@@ -53,7 +55,7 @@ if ! [ -d /proc/$mysql_pid ]; then
echo "mysqld exited, aborting."
echo "mysqld exited, aborting."
exit 1
exit 1
fi
fi
$instance_directory/etc/run/mariadb_update
&
"$update_executable"
&
mariadb_update_pid=$!
mariadb_update_pid=$!
sleep 60
sleep 60
# If mariadb_update is still running, abort
# If mariadb_update is still running, abort
...
...
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