[Buildroot] [PATCH 1/1] package/mariadb: add optional systemd dependency

[Buildroot] [PATCH 1/1] package/mariadb: add optional systemd dependency

[Danny Wood]

If systemd is used we should enable support in mariadb and enable
"Type=notify" in the mysqld.service unit file

"Type=notify" stops systemd from starting services which depend on mariadb
until it has notified systemd that it has finished starting up, this helps
avoid startup race conditions

Signed-off-by: Danny Wood <danny@rotronics.co.uk>
---
 package/mariadb/mariadb.mk     | 4 ++++
 package/mariadb/mysqld.service | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index a2701643e1..947cb7c0de 100644
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@@ -72,6 +72,10 @@ MARIADB_CONF_OPTS += \
 	-DLIBRESSL_RESULT__TRYRUN_OUTPUT="LibreSSL $(LIBRESSL_VERSION)"
 endif
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+MARIADB_DEPENDENCIES += systemd
+endif
+
 ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y)
 ifeq ($(BR2_PACKAGE_MARIADB_SERVER_EMBEDDED),y)
 MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON
diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service
index 537430e9a2..9433e14630 100644
--- a/package/mariadb/mysqld.service
+++ b/package/mariadb/mysqld.service
@@ -9,6 +9,8 @@ Restart=always
 User=mysql
 RuntimeDirectory=mysql
 RuntimeDirectoryMode=0755
+Type=notify
+NotifyAccess=all
 
 [Install]
 WantedBy=multi-user.target
-- 
2.41.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/mariadb: add optional systemd dependency

[Thomas Petazzoni via buildroot]

Hello Danny,

On Fri, 28 Jul 2023 11:11:40 +0100
Danny Wood <danny@rotronics.co.uk> wrote:

> +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> +MARIADB_DEPENDENCIES += systemd
> +endif

Thanks for the patch. Is there some CMake option to explicitly
enable/disable systemd support in mariadb? If yes, we will want to use
them.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com



_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/mariadb: add optional systemd dependency

[Danny Wood]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

On 28/07/2023 11:18, Thomas Petazzoni wrote:
> Hello Danny,
>
> On Fri, 28 Jul 2023 11:11:40 +0100
> Danny Wood <danny@rotronics.co.uk> wrote:
>
>> +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
>> +MARIADB_DEPENDENCIES += systemd
>> +endif
> Thanks for the patch. Is there some CMake option to explicitly
> enable/disable systemd support in mariadb? If yes, we will want to use
> them.
>
> Thanks!
>
> Thomas
Yes there is.

I have updated my patch which is attached.

Thanks,
Danny

[-- Attachment #2: 0001-package-mariadb-add-optional-systemd-dependency.patch --]
[-- Type: text/x-patch, Size: 1639 bytes --]

From d008133b9bf7fd237ffb01ff8404d94882f6554e Mon Sep 17 00:00:00 2001
From: Danny Wood <danny@rotronics.co.uk>
Date: Thu, 27 Jul 2023 16:52:54 +0100
Subject: [PATCH 1/1] package/mariadb: add optional systemd dependency

If systemd is used we should enable support in mariadb and enable
"Type=notify" in the mysqld.service unit file

"Type=notify" stops systemd from starting services which depend on mariadb
until it has notified systemd that it has finished starting up, this helps
avoid startup race conditions

Signed-off-by: Danny Wood <danny@rotronics.co.uk>
---
 package/mariadb/mariadb.mk     | 7 +++++++
 package/mariadb/mysqld.service | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index a2701643e1..78e4703eee 100644
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@@ -72,6 +72,13 @@ MARIADB_CONF_OPTS += \
 	-DLIBRESSL_RESULT__TRYRUN_OUTPUT="LibreSSL $(LIBRESSL_VERSION)"
 endif
 
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+MARIADB_DEPENDENCIES += systemd
+MARIADB_CONF_OPTS += -DWITH_SYSTEMD=yes
+else
+MARIADB_CONF_OPTS += -DWITH_SYSTEMD=no
+endif
+
 ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y)
 ifeq ($(BR2_PACKAGE_MARIADB_SERVER_EMBEDDED),y)
 MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON
diff --git a/package/mariadb/mysqld.service b/package/mariadb/mysqld.service
index 537430e9a2..9433e14630 100644
--- a/package/mariadb/mysqld.service
+++ b/package/mariadb/mysqld.service
@@ -9,6 +9,8 @@ Restart=always
 User=mysql
 RuntimeDirectory=mysql
 RuntimeDirectoryMode=0755
+Type=notify
+NotifyAccess=all
 
 [Install]
 WantedBy=multi-user.target
-- 
2.41.0


[-- Attachment #3: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/mariadb: add optional systemd dependency

[Thomas Petazzoni via buildroot]

Hello Danny,

On Fri, 28 Jul 2023 13:23:45 +0100
Danny Wood <danny@rotronics.co.uk> wrote:

> I have updated my patch which is attached.

Thanks, I've applied this new iteration. However, we normally want new
iterations to be sent again with "git send-email", with a prefix such
as [PATCH v2] and a changelog. See
https://buildroot.org/downloads/manual/manual.html#submitting-patches
for some details.

Thanks for your contribution!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot