Skip to content
/ server Public

MDEV-30953 Add mariadb server galera package #4644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grooverdan wants to merge 2 commits into
base: 12.3
Choose a base branch
from
Open

MDEV-30953 Add mariadb server galera package #4644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0547f9d
MDEV-30953: Add package for Galera server
illuusio Sep 4, 2023
ba4b3c4
MDEV-30953: Add package for Galera server for RPM
illuusio Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
IF(UNIX)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
IF(WITH_WSREP)
INSTALL_DOCUMENTATION(Docs/README-wsrep COMPONENT Readme)
INSTALL_DOCUMENTATION(Docs/README-wsrep COMPONENT Server_Galera)
ENDIF()
ENDIF()

Expand Down
19 changes: 15 additions & 4 deletions cmake/cpack_rpm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ SET(CPACK_COMPONENT_SERVER_GROUP "server")
SET(CPACK_COMPONENT_INIFILES_GROUP "server")
SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "server")
SET(CPACK_COMPONENT_SUPPORTFILES_GROUP "server")
SET(CPACK_COMPONENT_SERVER_GALERA_GROUP "server-galera")
SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "devel")
SET(CPACK_COMPONENT_DEVELOPMENTSYMLINKS_GROUP "devel")
SET(CPACK_COMPONENT_MANPAGESDEVELOPMENT_GROUP "devel")
Expand All @@ -28,10 +29,11 @@ SET(CPACK_COMPONENT_COMPAT_GROUP "compat")
SET(CPACK_COMPONENT_BACKUP_GROUP "backup")
SET(CPACK_COMPONENT_BACKUPSYMLINKS_GROUP "backup")

SET(CPACK_COMPONENTS_ALL Server IniFiles Server_Scripts SupportFiles
Development ManPagesDevelopment Readme Test Common
Client SharedLibraries ClientPlugins Backup
TestSymlinks BackupSymlinks DevelopmentSymlinks
SET(CPACK_COMPONENTS_ALL Server IniFiles Server_Scripts Server_Galera
SupportFiles Development ManPagesDevelopment
Readme Test Common Client SharedLibraries
ClientPlugins Backup TestSymlinks BackupSymlinks
DevelopmentSymlinks
)

SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
Expand Down Expand Up @@ -95,6 +97,8 @@ SET(CPACK_RPM_devel_PACKAGE_SUMMARY "MariaDB database development files")
SET(CPACK_RPM_devel_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
SET(CPACK_RPM_server_PACKAGE_SUMMARY "MariaDB database server binaries")
SET(CPACK_RPM_server_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
SET(CPACK_RPM_server-galera_PACKAGE_SUMMARY "MariaDB database server binaries and scripts for Galera 4")
SET(CPACK_RPM_server-galera_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
SET(CPACK_RPM_test_PACKAGE_SUMMARY "MariaDB database regression test suite")
SET(CPACK_RPM_test_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")

Expand Down Expand Up @@ -263,6 +267,13 @@ SETA(CPACK_RPM_server_PACKAGE_REQUIRES
"MariaDB-common >= 10.6.1"
"MariaDB-client >= 11.0.0")

IF(WITH_WSREP)
SETA(CPACK_RPM_server_galera_PACKAGE_REQUIRES
"galera-4" "rsync" "lsof" "grep" "gawk" "iproute"
"coreutils" "findutils" "tar")
SETA(CPACK_RPM_server_PACKAGE_RECOMMENDS "pv")
ENDIF()

SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)
SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-preun.sh)
SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postin.sh)
Expand Down
16 changes: 9 additions & 7 deletions debian/additions/mariadb.conf.d/60-galera.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
#wsrep_cluster_name = "MariaDB Galera Cluster"

# Mandatory settings
#wsrep_provider = /usr/lib/galera/libgalera_smm.so
# per https://mariadb.com/docs/galera-cluster/readme/mariadb-galera-cluster-usage-guide#general-configuration
wsrep_provider = /usr/lib/galera/libgalera_smm.so
#wsrep_cluster_address = gcomm://
#binlog_format = ROW
#wsrep_on = ON
#default_storage_engine = InnoDB
binlog_format = ROW
wsrep_on = ON
binlog_format = row
innodb_autoinc_lock_mode = 2

# Allow server to accept connections on all interfaces.
#bind-address = 0.0.0.0
bind-address = 0.0.0.0

# Performance related settings
#innodb_autoinc_lock_mode = 2
# https://mariadb.com/docs/galera-cluster/galera-management/configuration/configuring-mariadb-galera-cluster#performance-related-options
#innodb_flush_log_at_trx_commit = 0
#wsrep_slave_threads = 1
#wsrep_slave_threads = 4
20 changes: 20 additions & 0 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,6 +972,26 @@ Description: MySQL compatibility links to mariadb-server binaries/scripts.
This package is also useful for users with strong background in MySQL
maintenance, but wants to switch to MariaDB

Package: mariadb-server-galera
Copy link
Contributor

@ottok ottok Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or maybe mariadb-plugin-galera like the other plugins if that is what your plan is?

Architecture: any
Depends: galera-4 (>= 26.4),
gawk,
Copy link
Contributor

@ottok ottok Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file will be consistently formatted if you run wrap-and-sort -vast or debputy reformat --style black like was done in 5ed3668.

iproute2 [linux-any],
lsof [linux-any],
mariadb-server,
pv,
rsync,
socat,
${misc:Depends},
${shlibs:Depends}
Conflicts: mariadb-server (<< 12.3)
Breaks: mariadb-server (<< 1:12.3)
Copy link
Contributor

@ottok ottok Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested, but I suspect this also needs a Replaces: mariadb-server (<< 1:12.3.2) and that all versions should be 1:12.3.2?

Description: MariaDB scripts and configuration needed by Galera cluster
MariaDB Galera Cluster is a virtually synchronous multi-primary
cluster for MariaDB.
.
Galera Cluster needs this package
Copy link
Contributor

@ottok ottok Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This repeats the title. How about:

Description: MariaDB scripts and configuration needed by Galera cluster
 MariaDB Galera Cluster is a virtually synchronous multi-primary
 cluster for MariaDB.
 .
 Galera is the underlying replication plugin that makes this clustering
 possible. It provides write-set replication with group communication
 primitives to ensure data consistency across all nodes in real-time.
 .
 The library enables active-active multi-master topologies with automatic
 membership control, supports both incremental (IST) and snapshot (SST)
 state transfers, and guarantees no transaction loss on node failures
 through its virtually synchronous replication protocol.


Package: mariadb-backup
Architecture: any
Breaks:
Expand Down
1 change: 0 additions & 1 deletion debian/mariadb-client.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ debian/additions/innotop/innotop usr/bin/
debian/additions/mariadb-report usr/bin/
debian/additions/mariadb.conf.d/50-client.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/50-mariadb-clients.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/60-galera.cnf etc/mysql/mariadb.conf.d
usr/bin/mariadb-access
usr/bin/mariadb-admin
usr/bin/mariadb-binlog
Expand Down
19 changes: 19 additions & 0 deletions debian/mariadb-server-galera.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
debian/additions/mariadb.conf.d/60-galera.cnf etc/mysql/mariadb.conf.d
lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
usr/bin/galera_new_cluster
usr/bin/galera_recovery
usr/bin/wsrep_sst_common
usr/bin/wsrep_sst_mariabackup
usr/bin/wsrep_sst_mysqldump
usr/bin/wsrep_sst_rsync
usr/bin/wsrep_sst_rsync_wan
usr/lib/mysql/plugin/wsrep_info.so
usr/share/man/man1/galera_new_cluster.1
usr/share/man/man1/galera_recovery.1
usr/share/man/man1/wsrep_sst_common.1
usr/share/man/man1/wsrep_sst_mariabackup.1
usr/share/man/man1/wsrep_sst_mysqldump.1
usr/share/man/man1/wsrep_sst_rsync.1
usr/share/man/man1/wsrep_sst_rsync_wan.1
usr/share/mariadb/wsrep.cnf
usr/share/mariadb/wsrep_notify
19 changes: 1 addition & 18 deletions debian/mariadb-server.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ lib/systemd/system/mariadb-extra@.socket
lib/systemd/system/mariadb.service
lib/systemd/system/mariadb@.service
lib/systemd/system/mariadb@.socket
lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
lib/systemd/system/mysql.service
lib/systemd/system/mysqld.service
support-files/rpm/enable_encryption.preset etc/mysql/mariadb.conf.d/99-enable-encryption.cnf.preset
Expand All @@ -20,8 +19,6 @@ usr/bin/aria_dump_log
usr/bin/aria_ftdump
usr/bin/aria_pack
usr/bin/aria_read_log
usr/bin/galera_new_cluster
usr/bin/galera_recovery
usr/bin/mariadb-service-convert
usr/bin/mariadbd-multi
usr/bin/mariadbd-safe
Expand All @@ -30,11 +27,6 @@ usr/bin/myisam_ftdump
usr/bin/myisamchk
usr/bin/myisamlog
usr/bin/myisampack
usr/bin/wsrep_sst_common
usr/bin/wsrep_sst_mariabackup
usr/bin/wsrep_sst_mysqldump
usr/bin/wsrep_sst_rsync
usr/bin/wsrep_sst_rsync_wan
usr/lib/mysql/plugin/auth_ed25519.so
usr/lib/mysql/plugin/auth_mysql_sha2.so
usr/lib/mysql/plugin/auth_pam.so
Expand All @@ -58,16 +50,13 @@ usr/lib/mysql/plugin/server_audit.so
usr/lib/mysql/plugin/simple_password_check.so
usr/lib/mysql/plugin/sql_errlog.so
usr/lib/mysql/plugin/type_mysql_json.so
usr/lib/mysql/plugin/wsrep_info.so
usr/lib/tmpfiles.d/mariadb.conf
usr/share/doc/mariadb-server/mariadbd.sym.gz
usr/share/man/man1/aria_chk.1
usr/share/man/man1/aria_dump_log.1
usr/share/man/man1/aria_ftdump.1
usr/share/man/man1/aria_pack.1
usr/share/man/man1/aria_read_log.1
usr/share/man/man1/galera_new_cluster.1
usr/share/man/man1/galera_recovery.1
usr/share/man/man1/mariadb-service-convert.1
usr/share/man/man1/mariadbd-multi.1
usr/share/man/man1/mariadbd-safe-helper.1
Expand All @@ -76,11 +65,5 @@ usr/share/man/man1/myisam_ftdump.1
usr/share/man/man1/myisamchk.1
usr/share/man/man1/myisamlog.1
usr/share/man/man1/myisampack.1
usr/share/man/man1/wsrep_sst_common.1
usr/share/man/man1/wsrep_sst_mariabackup.1
usr/share/man/man1/wsrep_sst_mysqldump.1
usr/share/man/man1/wsrep_sst_rsync.1
usr/share/man/man1/wsrep_sst_rsync_wan.1
usr/share/mariadb/errmsg-utf8.txt
usr/share/mariadb/mini-benchmark
usr/share/mariadb/wsrep.cnf
usr/share/mariadb/wsrep_notify
2 changes: 1 addition & 1 deletion scripts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ ELSE()
wsrep_sst_common
)

INSTALL_LINK(wsrep_sst_rsync wsrep_sst_rsync_wan ${INSTALL_BINDIR} Server)
INSTALL_LINK(wsrep_sst_rsync wsrep_sst_rsync_wan ${INSTALL_BINDIR} Server_Galera)
FOREACH(file ${WSREP_SOURCE})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
Expand Down
4 changes: 2 additions & 2 deletions support-files/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ IF(WITH_WSREP AND NOT WITHOUT_SERVER)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh
${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension}
DESTINATION ${inst_location} COMPONENT IniFiles)
DESTINATION ${inst_location} COMPONENT Server_Galera)
ENDIF()

IF(UNIX AND NOT WITHOUT_SERVER)
Expand Down Expand Up @@ -150,7 +150,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)

IF(WITH_WSREP)
INSTALL(FILES use_galera_new_cluster.conf
DESTINATION ${inst_location}/systemd COMPONENT SupportFiles)
DESTINATION ${inst_location}/systemd COMPONENT Server_Galera)
ENDIF()
INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/mariadb.service
Expand Down