From owner-svn-ports-all@freebsd.org Sun Jan 17 18:52:07 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4A1014D416A; Sun, 17 Jan 2021 18:52:07 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DJkYM1hM6z3skP; Sun, 17 Jan 2021 18:52:07 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2CE24261F3; Sun, 17 Jan 2021 18:52:07 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10HIq7fl041212; Sun, 17 Jan 2021 18:52:07 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10HIq6NA041210; Sun, 17 Jan 2021 18:52:06 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202101171852.10HIq6NA041210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sun, 17 Jan 2021 18:52:06 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/databases/mysqlwsrep57-server: . files X-SVN-Commit-Revision: 561860 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2021 18:52:07 -0000 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"