kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

databases/mysqlwsrep57-server Make service_startup_timeout configurable

Browse source 
PR:		252264
Submitted by:	daniele.sciascia@galeracluster.com
Approved by:	maintainer timeout (devel@galeracluster.com, >2 weeks)
This commit is contained in:
Steve Wills 2021-01-17 18:52:06 +00:00
parent 503dfeac3a
commit 332511d8c7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=561860
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
databases/mysqlwsrep57-server/Makefile
View file

@ -5,7 +5,7 @@ PORTNAME= mysqlwsrep
PORTVERSION?= 5.7.31
DISTVERSIONPREFIX?= wsrep_
DISTVERSIONSUFFIX?= -25.23
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES+= SF/boost/boost/1.59.0:boost
PKGNAMESUFFIX= 57-server

6
databases/mysqlwsrep57-server/files/mysql-server.in
View file

@ -26,6 +26,8 @@
# Default to "${mysql_dbdir}/${hostname}.pid".
# mysql_args (str): Custom additional arguments to be passed
# to mysqld_safe (default empty).
# mysql_startup_timeout (int): How much time, in seconds, should
# we wait for mysqld to start (default 900).
#
. /etc/rc.subr
@ -59,7 +61,7 @@ start_precmd="${name}_prestart"
start_postcmd="${name}_poststart"
mysql_install_db="${procname}"
mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user} --initialize"
service_startup_timeout=900
: ${mysql_startup_timeout=900}
startup_sleep=1
sst_progress_file=${mysql_dbdir}/sst_in_progress
extra_commands="bootstrap"
@ -94,7 +96,7 @@ mysql_prestart()
mysql_poststart()
{
local timeout=${service_startup_timeout}
local timeout=${mysql_startup_timeout}
while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
if test -e $sst_progress_file && [ $startup_sleep -ne 100 ]; then
check_startmsgs && echo "SST in progress, setting sleep higher"