From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id UGu1B39cemOmPQAAbAwnHQ (envelope-from ) for ; Sun, 20 Nov 2022 17:57:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 6OGrB39cemMfIQAA9RJhRA (envelope-from ) for ; Sun, 20 Nov 2022 17:57:35 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D617B1FFFF for ; Sun, 20 Nov 2022 17:57:34 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owncu-0003FS-18; Sun, 20 Nov 2022 11:57:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owncs-0003Es-Ng for guix-patches@gnu.org; Sun, 20 Nov 2022 11:57:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owncs-0002IP-EW for guix-patches@gnu.org; Sun, 20 Nov 2022 11:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1owncs-0001hT-3p for guix-patches@gnu.org; Sun, 20 Nov 2022 11:57:02 -0500 Subject: bug#49155: [PATCH] gnu: mysql: Support custom data dir. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sun, 20 Nov 2022 16:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 49155 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Aljosha Papsch , 49155-done@debbugs.gnu.org Cc: Ellen Papsch Mail-Followup-To: 49155@debbugs.gnu.org, marius@gnu.org, ep@stern-data.com Received: via spool by 49155-done@debbugs.gnu.org id=D49155.16689633876485 (code D ref 49155); Sun, 20 Nov 2022 16:57:01 +0000 Received: (at 49155-done) by debbugs.gnu.org; 20 Nov 2022 16:56:27 +0000 Received: from localhost ([127.0.0.1]:44397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owncI-0001gX-K3 for submit@debbugs.gnu.org; Sun, 20 Nov 2022 11:56:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owncF-0001gI-8q for 49155-done@debbugs.gnu.org; Sun, 20 Nov 2022 11:56:25 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ownc8-00023i-Da; Sun, 20 Nov 2022 11:56:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=n3Z+nH4f1/DDQALkB3iUN36rwnxmVcqgwFkv6LA7zLw=; b=kW8QUly5RqQJuoWIn473 3Ky/MnvDWg348ZkZPjVF6raqUR+4LqcJy4WOUXonmW4zgo5aSaU8//1Dv0gc7E4fYNmtflL7GkjcT hS3ZVKTj+4bXQmUrKU9CEg/nTOiwMca4Q6fsJV/dSu8VIPu/piEkGhI71d2F24n5Cd1uCtI1n6ieM K8UOdkKIPEkh2/GrdI9AaExrXEAZUJdHDrANTePRciwkaw8puLE7uPzUEj5Vv9IuUlRzUt9EfE0Zj 6MPi8WWpyQDL9yffLMNjNzZXuWFaeWw67qn8+LC/ptRg+sCk5DDBP16o8nZrkZkOS28Zl1gOFuQUz 9bl1sAbf/1eyvw==; Received: from [84.214.173.6] (helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ownc7-0001gZ-03; Sun, 20 Nov 2022 11:56:16 -0500 From: Marius Bakke In-Reply-To: <20210621132750.49528-1-ep@stern-data.com> References: <20210621132750.49528-1-ep@stern-data.com> Date: Sun, 20 Nov 2022 17:56:12 +0100 Message-ID: <8735ad1s5v.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668963454; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=n3Z+nH4f1/DDQALkB3iUN36rwnxmVcqgwFkv6LA7zLw=; b=mF5hGqBjm53gThfA/+4WoRufVIY7aVVc2as95HFIL/Y0qmUNkkTJjfGpV0DSTOjBbP3IOz V7nisCHugpwCs4F/NAiTksGWUicYDx3qPuo2SPjeZk3DVAwQs0Me4D3ZESYgmmFSB4eFaC 1AxWU76hR9NrR05klr7v9bwfAcPmzn9p8uiySW2Xy92AMohoHWDw4w8KPFZxXBA+wHdMYY c097W2JdJ8slYxki7x4SDhOxtMj56rKRwMD2fe/M54IXVxs2fTC8WCoJt94N4f1utrg7HZ kEGQW07KHet+/9jL2G62pe/Ym8lw6et7cljtgyf7a+L79CMxwVLubUv7P8jB5Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668963454; a=rsa-sha256; cv=none; b=a0L1sFRF+/9uZG77ISoHeLow3FZrL9WLJyu9BRTDb0xhR5dYZUXlAscXGHsvvD+3+gcdpV hMTgPL+Zo2cTS+ORlyeKsS6M1uVaTOU3+L/M5a7cFfOtPJU3NNMQK6GrBRIy345q+wIPQW rT+41WygjDJHCa+Jr5FGQTydlbcxAi4icAFMjZrwm2LCUKu4fDIkQlXD4eeCk0t/HqPkjz Y5wSUhMvBksOIXnS6XSmk6BqtS3SVRfCtbHdli4p8pXHKStJ+1lDnizYOWZEYBoYi3NWip G6+DtsPXJH33Z4/icwugR6KlmXtavqxLBpAMzBsfqEI3rlbN/pXwReF5UuBbXA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=kW8QUly5; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=kW8QUly5; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: D617B1FFFF X-Spam-Score: -4.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: Y6GqNhChLtmw --=-=-= Content-Type: text/plain Hi! Thanks for the patch, and sorry for the slooow response... Aljosha Papsch skriver: > From: Ellen Papsch > > * gnu/services/databases.scm (mysql-configuration): Add datadir property. > * gnu/services/databases.scm (mysql-configuration-file): Replace hard coded > data dir with property from config. > * gnu/services/databases.scm (%mysql-activation): Remove activation, it runs > before PID 1. The data dir may reside on a file system not mounted at this > time. > * gnu/services/databases.scm (mysql-install-shepherd-service): Create service > which replaces the activation. Provide mysql-install. > * gnu/services/databases.scm (mysql-shepherd-service): Move invocation of > mysqld to mysql-start program-file, because the invocation gotten more > complex. Require mysql-install. > * gnu/services/databases.scm (mysql-start): Invoke mysqld only if a lock file > appears. > * gnu/services/databases.scm (mysql-shepherd-services): Prepend the install > service before the normal service. > * gnu/services/databases.scm (mysql-upgrade-wrapper): Increase timeout to > 20s to let the mysql install procedure finish. I have finally applied this patch, along with a follow-up commit to make the mysql-upgrade service also work with a custom datadir. I also ended up dropping the 'mysql-install' service in favor of a mysqld wrapper script that calls the mysql-install script at startup when the "mysql" DB is missing. Pushed in c7b266fdf2754c139803c156677bf2828c78d072. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCY3pcLA8cbWFyaXVzQGdu dS5vcmcACgkQ6HGLpZEUEHegOAEA/qTvA4fe5RxpSNFI5DoHMXJCASE8BomO6YrC l16bqFoA/i6tv8oeiwZSL6GWHB8b+OzESmpwJ1Ttrs62uSHNmjwA =vz+R -----END PGP SIGNATURE----- --=-=-=--