Jcrespo has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364477 )
Change subject: mariadb: Fix systemd unit for controling multi-instances ...................................................................... mariadb: Fix systemd unit for controling multi-instances * Fix typo on service unit s/LimitCore/LimitCORE/ * Add missing separator '@' between mysqld and the shard. * Avoid override- by default allow an insane amount of open file descriptors; this is needed in almost all instances we host Deployed on wmf-mariadb101_10.1.25-4 Bug: T169514 Change-Id: I57e858a02c3daf37ad031aa066afafbe1317a1e5 --- M dbtools/control-mariadb-10.1-stretch M dbtools/mariadb.service M dbtools/[email protected] 3 files changed, 7 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Jcrespo: Looks good to me, approved diff --git a/dbtools/control-mariadb-10.1-stretch b/dbtools/control-mariadb-10.1-stretch index d7affa3..6e5775f 100644 --- a/dbtools/control-mariadb-10.1-stretch +++ b/dbtools/control-mariadb-10.1-stretch @@ -1,5 +1,5 @@ Package: wmf-mariadb101 -Version: 10.1.25-1 +Version: 10.1.25-4 Section: misc Priority: optional Architecture: amd64 diff --git a/dbtools/mariadb.service b/dbtools/mariadb.service index c359cd8..68feea1 100644 --- a/dbtools/mariadb.service +++ b/dbtools/mariadb.service @@ -128,8 +128,8 @@ # Number of files limit. previously [mysqld_safe] open-file-limit # Please set ulimits on a separate file, in particular the os default -# will not be enough on s3, dbstores and labs (they need ~400 000) -#LimitNOFILE=65536 +# will not be enough on s3, dbstores and labs (they need ~200 000) +LimitNOFILE=200001 # Maximium core size. previously [mysqld_safe] core-file-size # Set core by default to 0. For debugging, set higher diff --git a/dbtools/[email protected] b/dbtools/[email protected] index c7e8360..d3293fd 100644 --- a/dbtools/[email protected] +++ b/dbtools/[email protected] @@ -105,7 +105,7 @@ # # IMPORTANT: We assume the main my.cnf includes /etc/mysql/mysqld.conf.d/%I -ExecStart=BASEDIR/bin/mysqld --defaults-group-suffix=%I $MYSQLD_OPTS +ExecStart=BASEDIR/bin/mysqld --defaults-group-suffix=@%I $MYSQLD_OPTS # Unset _WSREP_START_POSITION environment variable. #ExecStartPost=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION%I" @@ -152,11 +152,11 @@ # Number of files limit. previously [mysqld_safe] open-file-limit # Please set ulimits on a separate file, in particular the os default -# will not be enough on s3, dbstores and labs (they need ~400 000) -#LimitNOFILE=16364 +# will not be enough on s3, dbstores and labs (they need ~200 000) +LimitNOFILE=200001 # Maximium core size. previously [mysqld_safe] core-file-size -LimitCore=0 +LimitCORE=0 # Nice priority. previously [mysqld_safe] nice # Nice=-5 -- To view, visit https://gerrit.wikimedia.org/r/364477 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57e858a02c3daf37ad031aa066afafbe1317a1e5 Gerrit-PatchSet: 3 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Jcrespo <[email protected]> Gerrit-Reviewer: Jcrespo <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
