Jcrespo has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/368189 )
Change subject: mariadb-package: Fix comment saying 10 minutes ...................................................................... mariadb-package: Fix comment saying 10 minutes In reality we set the server to not timeout, as it can take an arbitrary amount of time, and a kill can corrupt the data while starting if we are not careful- we chose to kill it manually if there is an issue. Change-Id: I039957087de3942f21d1e26ca36760510ae084fc --- M dbtools/control-mariadb-10.1-stretch M dbtools/mariadb.service M dbtools/mariadb@.service 3 files changed, 7 insertions(+), 5 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 6e5775f..4ac089d 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-4 +Version: 10.1.25-5 Section: misc Priority: optional Architecture: amd64 diff --git a/dbtools/mariadb.service b/dbtools/mariadb.service index 9f5139d..f574de4 100644 --- a/dbtools/mariadb.service +++ b/dbtools/mariadb.service @@ -60,8 +60,9 @@ # Execute pre and post scripts as root, otherwise it does it as User= PermissionsStartOnly=true -# Set TimeoutStartSec and TimeoutStopSec to 10 minutes (sometimes it -# can take a very long time to stop a server or start it if it crashed) +# Set TimeoutStartSec and TimeoutStopSec to infinity (sometimes it +# can take a very long time to stop a server or start it if it crashed, +# like 1 hour or more and be a normal behaviour) TimeoutSec=infinity # WE DISABLE ALL GALERA RELATED FUNCTIONALITY diff --git a/dbtools/mariadb@.service b/dbtools/mariadb@.service index 885ff69..5002f04 100644 --- a/dbtools/mariadb@.service +++ b/dbtools/mariadb@.service @@ -67,8 +67,9 @@ # Execute pre and post scripts as root, otherwise it does it as User= PermissionsStartOnly=true -# Set TimeoutStartSec and TimeoutStopSec to 10 minutes (sometimes it -# can take a very long time to stop a server or start it if it crashed) +# Set TimeoutStartSec and TimeoutStopSec to infinity (sometimes it +# can take a very long time to stop a server or start it if it crashed, +# like 1 hour or more and be a normal behaviour) TimeoutSec=infinity # WE DISABLE ALL GALERA RELATED FUNCTIONALITY -- To view, visit https://gerrit.wikimedia.org/r/368189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I039957087de3942f21d1e26ca36760510ae084fc Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Jcrespo <jcre...@wikimedia.org> Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org> Gerrit-Reviewer: Volans <rcocci...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
