diff options
| author | Steve Wills <swills@FreeBSD.org> | 2021-01-17 18:52:06 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2021-01-17 18:52:06 +0000 |
| commit | 332511d8c7ae3634bec4a6fe4129a65524f0960e (patch) | |
| tree | 363062e7912b091bcf5c8f34f6ebf8b15abe7c3c /databases/mysqlwsrep57-server | |
| parent | 503dfeac3aca937b650b9004c914fb1e1f00ee81 (diff) | |
| download | ports-332511d8c7ae3634bec4a6fe4129a65524f0960e.tar.gz ports-332511d8c7ae3634bec4a6fe4129a65524f0960e.zip | |
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)
Notes
Notes:
svn path=/head/; revision=561860
Diffstat (limited to 'databases/mysqlwsrep57-server')
| -rw-r--r-- | databases/mysqlwsrep57-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysqlwsrep57-server/files/mysql-server.in | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile index 220531d7a083..60b2343fd063 100644 --- a/databases/mysqlwsrep57-server/Makefile +++ b/databases/mysqlwsrep57-server/Makefile @@ -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 diff --git a/databases/mysqlwsrep57-server/files/mysql-server.in b/databases/mysqlwsrep57-server/files/mysql-server.in index 66117c8d52be..a9f18d47e1bc 100644 --- a/databases/mysqlwsrep57-server/files/mysql-server.in +++ b/databases/mysqlwsrep57-server/files/mysql-server.in @@ -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" |