From: david larsson <david.larsson@selfhosted.xyz>
To: 47704@debbugs.gnu.org
Subject: [bug#47704] [PATCH] services: mysql: Add extra-environment as configuration option.
Date: Sun, 11 Apr 2021 10:44:43 +0200 [thread overview]
Message-ID: <91c1726e12b938f7656d7d7862920f69@selfhosted.xyz> (raw)
[-- Attachment #1: Type: text/plain, Size: 2237 bytes --]
Hi!
This patch is needed for the Galera add-on to MariaDB, which runs some
scripts like for example wsrep_sst_rsync that needs access to additional
binaries in PATH.
I tested the patch with (and without) below snippets to the
mysql-service in my config.scm and successfully connected to a
MariaDB/Galera cluster.
I ran these commands to test:
guix pull --url=/home/user1/src/guix --profile=/tmp/guix.master
--disable-authentication --allow-downgrades ;
GUIX_PROFILE="/tmp/guix.master" ; . "$GUIX_PROFILE/etc/profile" ; guix
system reconfigure config.scm --fallback --allow-downgrades
------------------------------------------------------------------
(extra-environment #~(list (string-append "PATH=/usr/bin:/bin:" #$rsync
"/bin:" #$coreutils "/bin:" #$gawk "/bin:" #$grep "/bin:" #$mariadb
"/bin:" #$iproute "/sbin:"
"/run/setuid-programs:/run/current-system/profile/bin:/run/current-system/profile/sbin"
) (string-append "SHELL=" #$bash) "USER=mysql"
"SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt"
"SSL_CERT_DIR=/run/current-system/profile/etc/ssl/certs"))
(extra-content #~(string-append "log_error=/var/lib/mysql/log_error.log
#
https://www.percona.com/blog/2017/07/26/what-is-innodb_autoinc_lock_mode-and-why-should-i-care/
binlog_format=ROW
default-storage-engine=innodb
innodb_autoinc_lock_mode=2
# Galera Provider Configuration
wsrep_on=ON
wsrep_provider=" #$galera "/lib/libgalera_smm.so
# Galera Cluster Configuration
wsrep_cluster_name=\"test_cluster\"
wsrep_cluster_address=\"gcomm://redacted,redacted\"
# according to
https://galeracluster.com/library/documentation/mysql-wsrep-options.html
# leaving it empty starts a new cluster, so you should immediately
reconfigure again after doing this.
#wsrep_cluster_address=\"gcomm://\"
# Galera Synchronization Configuration
wsrep_sst_method=rsync
# Galera Node Configuration
wsrep_node_address=\"redacted\"
wsrep_node_name=\"librem13v3guixsd\""))
))
------------------------------------------------------------------
Please someone also review [bug#47517] [PATCH] gnu: nginx: Enable stream
module
which adds support for tcp loadbalancing that can be used to scale a
MariaDB/Galera cluster.
Best regards,
David
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-services-mysql-Add-extra-environment-as-configuratio.patch --]
[-- Type: text/x-diff; name=0001-services-mysql-Add-extra-environment-as-configuratio.patch, Size: 2954 bytes --]
From 927444652f4b774928de78c1558b4e942abff203 Mon Sep 17 00:00:00 2001
From: methuselah-0 <david.larsson@selfhosted.xyz>
Date: Sun, 11 Apr 2021 10:30:01 +0200
Subject: [PATCH] services: mysql: Add extra-environment as configuration
option.
* gnu/services/databases.scm (mysql-configuration): Add extra-environment
(mysql-service): Use #:log-file and #:environment-variables
* doc/guix.texi: Document it.
---
doc/guix.texi | 3 +++
gnu/services/databases.scm | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index c23d044ff5..298585a695 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19809,6 +19809,9 @@ Socket file to use for local (non-network) connections.
@item @code{extra-content} (default: @code{""})
Additional settings for the @file{my.cnf} configuration file.
+@item @code{extra-environment} (default: @code{#~'()})
+List of environment variables passed to the @command{mysqld} process.
+
@item @code{auto-upgrade?} (default: @code{#t})
Whether to automatically run @command{mysql_upgrade} after starting the
service. This is necessary to upgrade the @dfn{system schema} after
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index a841e7a50e..8d266c1cba 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -527,6 +528,7 @@ created after the PostgreSQL database is started.")))
(port mysql-configuration-port (default 3306))
(socket mysql-configuration-socket (default "/run/mysqld/mysqld.sock"))
(extra-content mysql-configuration-extra-content (default ""))
+ (extra-environment mysql-configuration-extra-environment (default #~'()))
(auto-upgrade? mysql-configuration-auto-upgrade? (default #t)))
(define %mysql-accounts
@@ -611,11 +613,14 @@ FLUSH PRIVILEGES;
(provision '(mysql))
(documentation "Run the MySQL server.")
(start (let ((mysql (mysql-configuration-mysql config))
+ (extra-env (mysql-configuration-extra-environment config))
(my.cnf (mysql-configuration-file config)))
#~(make-forkexec-constructor
(list (string-append #$mysql "/bin/mysqld")
(string-append "--defaults-file=" #$my.cnf))
- #:user "mysql" #:group "mysql")))
+ #:user "mysql" #:group "mysql"
+ #:log-file "/var/log/mysqld.log"
+ #:environment-variables #$extra-env)))
(stop #~(make-kill-destructor)))))
(define (mysql-upgrade-wrapper mysql socket-file)
--
2.30.2
next reply other threads:[~2021-04-11 8:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-11 8:44 david larsson [this message]
2021-04-11 15:33 ` [bug#47704] [PATCH] services: mysql: Add extra-environment as configuration option Maxime Devos
2021-04-11 18:07 ` david larsson
2021-04-11 20:44 ` Maxime Devos
2021-04-12 18:06 ` david larsson
2021-04-12 20:09 ` Maxime Devos
2021-04-13 16:58 ` bug#47704: " Leo Prikler
2021-04-13 22:29 ` [bug#47704] " Julien Lepiller
2021-04-13 22:38 ` Leo Prikler
2021-04-13 22:56 ` Julien Lepiller
2021-04-19 9:59 ` Leo Prikler
2021-04-27 18:15 ` david larsson
2021-04-27 18:47 ` Leo Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=91c1726e12b938f7656d7d7862920f69@selfhosted.xyz \
--to=david.larsson@selfhosted.xyz \
--cc=47704@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).