Date: Sun, 17 Jan 2021 18:52:06 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561860 - in head/databases/mysqlwsrep57-server: . files Message-ID: <202101171852.10HIq6NA041210@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun Jan 17 18:52:06 2021 New Revision: 561860 URL: https://svnweb.freebsd.org/changeset/ports/561860 Log: databases/mysqlwsrep57-server Make service_startup_timeout configurable PR: 252264 Submitted by: daniele.sciascia@galeracluster.com Approved by: maintainer timeout (devel@galeracluster.com, >2 weeks) Modified: head/databases/mysqlwsrep57-server/Makefile (contents, props changed) head/databases/mysqlwsrep57-server/files/mysql-server.in Modified: head/databases/mysqlwsrep57-server/Makefile ============================================================================== --- head/databases/mysqlwsrep57-server/Makefile Sun Jan 17 18:43:12 2021 (r561859) +++ head/databases/mysqlwsrep57-server/Makefile Sun Jan 17 18:52:06 2021 (r561860) @@ -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 Modified: head/databases/mysqlwsrep57-server/files/mysql-server.in ============================================================================== --- head/databases/mysqlwsrep57-server/files/mysql-server.in Sun Jan 17 18:43:12 2021 (r561859) +++ head/databases/mysqlwsrep57-server/files/mysql-server.in Sun Jan 17 18:52:06 2021 (r561860) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101171852.10HIq6NA041210>