Import content from the mariadb component - branch rawhide
(f3da161f99
)
This commit is contained in:
commit
133a635f32
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
/*/
|
||||
/*.rpm
|
||||
/*.tar.gz
|
27
LICENSE.clustercheck
Normal file
27
LICENSE.clustercheck
Normal file
@ -0,0 +1,27 @@
|
||||
Copyright (c) 2012-2014, Olaf van Zandwijk
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification,
|
||||
are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
3. Neither the name of the copyright holder nor the names of its contributors
|
||||
may be used to endorse or promote products derived from this software without
|
||||
specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
9
README.mariadb-docs
Normal file
9
README.mariadb-docs
Normal file
@ -0,0 +1,9 @@
|
||||
MariaDB haven't yet made a document package available for offline.
|
||||
|
||||
You can create your own copy with the instructions here:
|
||||
|
||||
https://mariadb.com/kb/en/meta/mirroring-the-mariadb-knowledge-base/
|
||||
|
||||
You can find view the on-line documentation at:
|
||||
|
||||
https://mariadb.com/kb/en/documentation/
|
89
clustercheck.sh
Normal file
89
clustercheck.sh
Normal file
@ -0,0 +1,89 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Script to make a proxy (ie HAProxy) capable of monitoring Galera cluster nodes properly
|
||||
#
|
||||
# Author: Olaf van Zandwijk <olaf.vanzandwijk@nedap.com>
|
||||
# Author: Raghavendra Prabhu <raghavendra.prabhu@percona.com>
|
||||
# Author: Ryan O'Hara <rohara@redhat.com>
|
||||
#
|
||||
# Documentation and download: https://github.com/olafz/percona-clustercheck
|
||||
#
|
||||
# Based on the original script from Unai Rodriguez
|
||||
#
|
||||
|
||||
if [ -f @INSTALL_SYSCONFDIR@/sysconfig/clustercheck ]; then
|
||||
. @INSTALL_SYSCONFDIR@/sysconfig/clustercheck
|
||||
fi
|
||||
|
||||
MYSQL_USERNAME="${MYSQL_USERNAME-clustercheckuser}"
|
||||
MYSQL_PASSWORD="${MYSQL_PASSWORD-clustercheckpassword!}"
|
||||
MYSQL_HOST="${MYSQL_HOST:-127.0.0.1}"
|
||||
MYSQL_PORT="${MYSQL_PORT:-3306}"
|
||||
ERR_FILE="${ERR_FILE:-/dev/null}"
|
||||
AVAILABLE_WHEN_DONOR=${AVAILABLE_WHEN_DONOR:-0}
|
||||
AVAILABLE_WHEN_READONLY=${AVAILABLE_WHEN_READONLY:-1}
|
||||
DEFAULTS_EXTRA_FILE=${DEFAULTS_EXTRA_FILE:-@INSTALL_SYSCONFDIR@/my.cnf}
|
||||
|
||||
#Timeout exists for instances where mysqld may be hung
|
||||
TIMEOUT=10
|
||||
|
||||
if [[ -r $DEFAULTS_EXTRA_FILE ]];then
|
||||
MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE \
|
||||
--connect-timeout=$TIMEOUT \
|
||||
--user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} \
|
||||
--host=${MYSQL_HOST} --port=${MYSQL_PORT}"
|
||||
else
|
||||
MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT \
|
||||
--user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} \
|
||||
--host=${MYSQL_HOST} --port=${MYSQL_PORT}"
|
||||
fi
|
||||
#
|
||||
# Perform the query to check the wsrep_local_state
|
||||
#
|
||||
WSREP_STATUS=$($MYSQL_CMDLINE -e "SHOW STATUS LIKE 'wsrep_local_state';" \
|
||||
2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
|
||||
|
||||
if [[ "${WSREP_STATUS}" == "4" ]] || [[ "${WSREP_STATUS}" == "2" && ${AVAILABLE_WHEN_DONOR} == 1 ]]
|
||||
then
|
||||
# Check only when set to 0 to avoid latency in response.
|
||||
if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then
|
||||
READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \
|
||||
2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
|
||||
|
||||
if [[ "${READ_ONLY}" == "ON" ]];then
|
||||
# Galera cluster node local state is 'Synced', but it is in
|
||||
# read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0.
|
||||
# => return HTTP 503
|
||||
# Shell return-code is 1
|
||||
echo -en "HTTP/1.1 503 Service Unavailable\r\n"
|
||||
echo -en "Content-Type: text/plain\r\n"
|
||||
echo -en "Connection: close\r\n"
|
||||
echo -en "Content-Length: 35\r\n"
|
||||
echo -en "\r\n"
|
||||
echo -en "Galera cluster node is read-only.\r\n"
|
||||
sleep 0.1
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
# Galera cluster node local state is 'Synced' => return HTTP 200
|
||||
# Shell return-code is 0
|
||||
echo -en "HTTP/1.1 200 OK\r\n"
|
||||
echo -en "Content-Type: text/plain\r\n"
|
||||
echo -en "Connection: close\r\n"
|
||||
echo -en "Content-Length: 32\r\n"
|
||||
echo -en "\r\n"
|
||||
echo -en "Galera cluster node is synced.\r\n"
|
||||
sleep 0.1
|
||||
exit 0
|
||||
else
|
||||
# Galera cluster node local state is not 'Synced' => return HTTP 503
|
||||
# Shell return-code is 1
|
||||
echo -en "HTTP/1.1 503 Service Unavailable\r\n"
|
||||
echo -en "Content-Type: text/plain\r\n"
|
||||
echo -en "Connection: close\r\n"
|
||||
echo -en "Content-Length: 36\r\n"
|
||||
echo -en "\r\n"
|
||||
echo -en "Galera cluster node is not synced.\r\n"
|
||||
sleep 0.1
|
||||
exit 1
|
||||
fi
|
39
mariadb-check-socket.sh
Normal file
39
mariadb-check-socket.sh
Normal file
@ -0,0 +1,39 @@
|
||||
#!/bin/sh
|
||||
|
||||
# We check if there is already a process using the socket file,
|
||||
# since otherwise the systemd service file could report false
|
||||
# positive result when starting and mysqld_safe could remove
|
||||
# a socket file, which is actually being used by a different daemon.
|
||||
|
||||
source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
|
||||
|
||||
if test -e "$socketfile" ; then
|
||||
echo "Socket file $socketfile exists." >&2
|
||||
|
||||
# no write permissions
|
||||
if ! test -w "$socketfile" ; then
|
||||
echo "Not enough permission to write to the socket file $socketfile, which is suspicious." >&2
|
||||
echo "Please, remove $socketfile manually to start the service." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# not a socket file
|
||||
if ! test -S "$socketfile" ; then
|
||||
echo "The file $socketfile is not a socket file, which is suspicious." >&2
|
||||
echo "Please, remove $socketfile manually to start the service." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# some process uses the socket file
|
||||
response=`@bindir@/mariadb-admin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER --connect-timeout="${CHECKSOCKETTIMEOUT:-10}" ping 2>&1`
|
||||
if [ $? -eq 0 ] || echo "$response" | grep -q "Access denied for user" ; then
|
||||
echo "Is another MariaDB daemon already running with the same unix socket?" >&2
|
||||
echo "Please, stop the process using the socket $socketfile or remove the file manually to start the service." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# socket file is a garbage
|
||||
echo "No process is using $socketfile, which means it is a garbage, so it will be removed automatically." >&2
|
||||
fi
|
||||
|
||||
exit 0
|
39
mariadb-check-upgrade.sh
Normal file
39
mariadb-check-upgrade.sh
Normal file
@ -0,0 +1,39 @@
|
||||
#!/bin/sh
|
||||
|
||||
source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
|
||||
|
||||
upgrade_info_file="$datadir/mysql_upgrade_info"
|
||||
version=0
|
||||
# get version as integer from mysql_upgrade_info file
|
||||
if [ -f "$upgrade_info_file" ] && [ -r "$upgrade_info_file" ] ; then
|
||||
version_major=$(cat "$upgrade_info_file" | head -n 1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\..*$/\1/')
|
||||
version_minor=$(cat "$upgrade_info_file" | head -n 1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\..*$/\2/')
|
||||
if [[ $version_major =~ ^[0-9]+$ ]] && [[ $version_minor =~ ^[0-9]+$ ]] ; then
|
||||
version=$((version_major*100+version_minor))
|
||||
fi
|
||||
fi
|
||||
|
||||
# compute current version as integer
|
||||
thisversion=$((@MAJOR_VERSION@*100+@MINOR_VERSION@))
|
||||
|
||||
# provide warning in cases we should run mysql_upgrade
|
||||
if [ $version -ne $thisversion ] ; then
|
||||
|
||||
# give extra warning if some version seems to be skipped
|
||||
if [ $version -gt 0 ] && [ $version -lt 505 ] ; then
|
||||
echo "The datadir located at $datadir seems to be older than of a version 5.5. Please, mind that as a general rule, to upgrade from one release series to another, go to the next series rather than skipping a series." >&2
|
||||
fi
|
||||
|
||||
cat <<EOF >&2
|
||||
The datadir located at $datadir needs to be upgraded using 'mariadb-upgrade' tool. This can be done using the following steps:
|
||||
|
||||
1. Back-up your data before with 'mariadb-upgrade'
|
||||
2. Start the database daemon using 'systemctl start @DAEMON_NAME@.service'
|
||||
3. Run 'mariadb-upgrade' with a database user that has sufficient privileges
|
||||
|
||||
Read more about 'mariadb-upgrade' usage at:
|
||||
https://mariadb.com/kb/en/mysql_upgrade/
|
||||
EOF
|
||||
fi
|
||||
|
||||
exit 0
|
32
mariadb-logrotate.patch
Normal file
32
mariadb-logrotate.patch
Normal file
@ -0,0 +1,32 @@
|
||||
Adjust the 'mariadb.logrotate.sh' script in several ways:
|
||||
|
||||
* Use the correct log file pathname for Red Hat installations.
|
||||
|
||||
* Remove Debian specific code
|
||||
for the very unlikely, but possible scenario
|
||||
in which the debian config file would exist.
|
||||
|
||||
--- mariadb-10.11.6/support-files/mariadb.logrotate.sh 2023-11-08 16:51:43.000000000 +0100
|
||||
+++ mariadb-10.11.6/support-files/mariadb.logrotate.sh_patched 2023-12-17 18:03:36.955861025 +0100
|
||||
@@ -6,7 +6,7 @@
|
||||
# Read https://mariadb.com/kb/en/error-log/ to learn more about logging and
|
||||
# https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/ about rotating logs.
|
||||
|
||||
-@localstatedir@/mysqld.log @localstatedir@/mariadb.log @logdir@/*.log {
|
||||
+@LOG_LOCATION@ {
|
||||
|
||||
# Depends on a mysql@localhost unix_socket authenticated user with RELOAD privilege
|
||||
@su_user@
|
||||
@@ -45,11 +45,6 @@
|
||||
# has thanks to the default use of Unix socket authentication for the 'mysql'
|
||||
# (or root on Debian) account used everywhere since MariaDB 10.4.
|
||||
postrotate
|
||||
- if test -r /etc/mysql/debian.cnf
|
||||
- then
|
||||
- EXTRAPARAM='--defaults-file=/etc/mysql/debian.cnf'
|
||||
- fi
|
||||
-
|
||||
if test -x @bindir@/mariadb-admin
|
||||
then
|
||||
@bindir@/mariadb-admin $EXTRAPARAM --local flush-error-log \
|
||||
|
31
mariadb-ownsetup.patch
Normal file
31
mariadb-ownsetup.patch
Normal file
@ -0,0 +1,31 @@
|
||||
--- mariadb-10.4.14/support-files/CMakeLists.txt 2020-08-06 17:28:28.000000000 +0200
|
||||
+++ mariadb-10.4.14/support-files/CMakeLists.txt_patched 2020-09-03 13:21:07.826658279 +0200
|
||||
@@ -187,6 +187,7 @@ IF(UNIX)
|
||||
COMPONENT SharedLibraries)
|
||||
INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
|
||||
COMPONENT Client)
|
||||
+ CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_SOURCE_DIR}/rpm/server.cnf @ONLY)
|
||||
INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
|
||||
COMPONENT IniFiles)
|
||||
INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR}
|
||||
|
||||
diff -up mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup mariadb-10.0.15/support-files/rpm/server.cnf
|
||||
--- mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup 2015-01-24 23:55:55.110063592 +0100
|
||||
+++ mariadb-10.0.15/support-files/rpm/server.cnf 2015-01-24 23:57:42.308114387 +0100
|
||||
@@ -9,7 +9,16 @@
|
||||
[server]
|
||||
|
||||
# this is only for the mysqld standalone daemon
|
||||
+# Settings user and group are ignored when systemd is used.
|
||||
+# If you need to run mysqld under a different user or group,
|
||||
+# customize your systemd unit file for mysqld/mariadb according to the
|
||||
+# instructions in http://fedoraproject.org/wiki/Systemd
|
||||
[mysqld]
|
||||
+datadir=@MYSQL_DATADIR@
|
||||
+socket=@MYSQL_UNIX_ADDR@
|
||||
+log-error=@LOG_LOCATION@
|
||||
+pid-file=@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid
|
||||
+
|
||||
|
||||
#
|
||||
# * Galera-related settings
|
137
mariadb-prepare-db-dir.sh
Normal file
137
mariadb-prepare-db-dir.sh
Normal file
@ -0,0 +1,137 @@
|
||||
#!/bin/sh
|
||||
|
||||
# This script creates the MariaDB data directory during first service start.
|
||||
# In subsequent starts, it does nothing much.
|
||||
|
||||
source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
|
||||
|
||||
export LC_ALL=C
|
||||
|
||||
# Returns content of the specified directory
|
||||
# If listing files fails, fake-file is returned so which means
|
||||
# we'll behave like there was some data initialized
|
||||
# Some files or directories are fine to be there, so those are
|
||||
# explicitly removed from the listing
|
||||
# @param <dir> datadir
|
||||
list_datadir ()
|
||||
{
|
||||
( ls -1A "$1" 2>/dev/null || echo "fake-file" ) | grep -v \
|
||||
-e '^lost+found$' \
|
||||
-e '\.err$' \
|
||||
-e '^.bash_history$'
|
||||
}
|
||||
|
||||
# Checks whether datadir should be initialized
|
||||
# @param <dir> datadir
|
||||
should_initialize ()
|
||||
{
|
||||
test -z "$(list_datadir "$1")"
|
||||
}
|
||||
|
||||
# If two args given first is user, second is group
|
||||
# otherwise the arg is the systemd service file
|
||||
if [ "$#" -eq 2 ]
|
||||
then
|
||||
myuser="$1"
|
||||
mygroup="$2"
|
||||
else
|
||||
# Absorb configuration settings from the specified systemd service file,
|
||||
# or the default service if not specified
|
||||
SERVICE_NAME="$1"
|
||||
if [ x"$SERVICE_NAME" = x ]
|
||||
then
|
||||
SERVICE_NAME=@DAEMON_NAME@.service
|
||||
fi
|
||||
|
||||
myuser=`systemctl show -p User "${SERVICE_NAME}" |
|
||||
sed 's/^User=//'`
|
||||
if [ x"$myuser" = x ]
|
||||
then
|
||||
myuser=mysql
|
||||
fi
|
||||
|
||||
mygroup=`systemctl show -p Group "${SERVICE_NAME}" |
|
||||
sed 's/^Group=//'`
|
||||
if [ x"$mygroup" = x ]
|
||||
then
|
||||
mygroup=mysql
|
||||
fi
|
||||
fi
|
||||
|
||||
# Set up the errlogfile with appropriate permissions
|
||||
if [ ! -e "$errlogfile" -a ! -h "$errlogfile" -a x$(dirname "$errlogfile") = "x/var/log" ]; then
|
||||
case $(basename "$errlogfile") in
|
||||
mysql*.log|mariadb*.log) install /dev/null -m0640 -o$myuser -g$mygroup "$errlogfile" ;;
|
||||
*) ;;
|
||||
esac
|
||||
else
|
||||
# Provide some advice if the log file cannot be created by this script
|
||||
errlogdir=$(dirname "$errlogfile")
|
||||
if ! [ -d "$errlogdir" ] ; then
|
||||
echo "The directory $errlogdir does not exist." >&2
|
||||
exit 1
|
||||
elif [ -e "$errlogfile" -a ! -w "$errlogfile" ] ; then
|
||||
echo "The log file $errlogfile cannot be written, please, fix its permissions." >&2
|
||||
echo "The daemon will be run under $myuser:$mygroup" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Make the data directory if doesn't exist or empty
|
||||
if should_initialize "$datadir" ; then
|
||||
# First, make sure $datadir is there with correct permissions
|
||||
# (note: if it's not, and we're not root, this'll fail ...)
|
||||
if [ ! -e "$datadir" -a ! -h "$datadir" ]
|
||||
then
|
||||
mkdir -p "$datadir" || exit 1
|
||||
fi
|
||||
chown "$myuser:$mygroup" "$datadir"
|
||||
chmod 0755 "$datadir"
|
||||
[ -x /sbin/restorecon ] && /sbin/restorecon "$datadir"
|
||||
|
||||
# Now create the database
|
||||
echo "Initializing @NICE_PROJECT_NAME@ database" >&2
|
||||
# Avoiding deletion of files not created by mysql_install_db is
|
||||
# guarded by time check and sleep should help work-arounded
|
||||
# potential issues on systems with 1 second resolution timestamps
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1335849#c19
|
||||
INITDB_TIMESTAMP=`LANG=C date -u`
|
||||
sleep 1
|
||||
@bindir@/mariadb-install-db --rpm --datadir="$datadir" --user="$myuser" --skip-test-db >&2
|
||||
ret=$?
|
||||
if [ $ret -ne 0 ] ; then
|
||||
echo "Initialization of @NICE_PROJECT_NAME@ database failed." >&2
|
||||
echo "Perhaps @sysconfdir@/my.cnf is misconfigured or there is some problem with permissions of $datadir." >&2
|
||||
# Clean up any partially-created database files
|
||||
if [ ! -e "$datadir/mysql/user.frm" ] && [ -d "$datadir" ] ; then
|
||||
echo "Initialization of @NICE_PROJECT_NAME@ database was not finished successfully." >&2
|
||||
echo "Files created so far will be removed." >&2
|
||||
find "$datadir" -mindepth 1 -maxdepth 1 -newermt "$INITDB_TIMESTAMP" \
|
||||
-not -name "lost+found" -exec rm -rf {} +
|
||||
if [ $? -ne 0 ] ; then
|
||||
echo "Removing of created files was not successfull." >&2
|
||||
echo "Please, clean directory $datadir manually." >&2
|
||||
fi
|
||||
else
|
||||
echo "However, part of data has been initialized and those will not be removed." >&2
|
||||
echo "Please, clean directory $datadir manually." >&2
|
||||
fi
|
||||
exit $ret
|
||||
fi
|
||||
# upgrade does not need to be run on a fresh datadir
|
||||
echo "@VERSION@-MariaDB" >"$datadir/mysql_upgrade_info"
|
||||
else
|
||||
if [ -d "$datadir/mysql/" ] ; then
|
||||
# mysql dir exists, it seems data are initialized properly
|
||||
echo "Database @NICE_PROJECT_NAME@ is probably initialized in $datadir already, nothing is done."
|
||||
echo "If this is not the case, make sure the $datadir is empty before running `basename $0`."
|
||||
else
|
||||
# if the directory is not empty but mysql/ directory is missing, then
|
||||
# print error and let user to initialize manually or empty the directory
|
||||
echo "Database @NICE_PROJECT_NAME@ is not initialized, but the directory $datadir is not empty, so initialization cannot be done." >&2
|
||||
echo "Make sure the $datadir is empty before running `basename $0`." >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
exit 0
|
68
mariadb-scripts-common.sh
Normal file
68
mariadb-scripts-common.sh
Normal file
@ -0,0 +1,68 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Some useful functions used in other MariaDB helper scripts
|
||||
# This scripts defines variables datadir, errlogfile, socketfile
|
||||
|
||||
export LC_ALL=C
|
||||
|
||||
# extract value of a MariaDB option from config files
|
||||
# Usage: get_mysql_option VARNAME DEFAULT SECTION [ SECTION, ... ]
|
||||
# result is returned in $result
|
||||
# We use my_print_defaults which prints all options from multiple files,
|
||||
# with the more specific ones later; hence take the last match.
|
||||
get_mysql_option(){
|
||||
if [ $# -ne 3 ] ; then
|
||||
echo "get_mysql_option requires 3 arguments: section option default_value"
|
||||
return
|
||||
fi
|
||||
sections="$1"
|
||||
option_name="$2"
|
||||
default_value="$3"
|
||||
result=`@bindir@/my_print_defaults $my_print_defaults_extra_args $sections | sed -n "s/^--${option_name}=//p" | tail -n 1`
|
||||
if [ -z "$result" ]; then
|
||||
# not found, use default
|
||||
result="${default_value}"
|
||||
fi
|
||||
}
|
||||
|
||||
# For the case of running more instances via systemd, scripts that source
|
||||
# this file can get --default-group-suffix or similar option as the first
|
||||
# argument. The utility my_print_defaults needs to use it as well, so the
|
||||
# scripts sourcing this file work with the same options as the daemon.
|
||||
my_print_defaults_extra_args=''
|
||||
while echo "$1" | grep -q '^--defaults' ; do
|
||||
my_print_defaults_extra_args="${my_print_defaults_extra_args} $1"
|
||||
shift
|
||||
done
|
||||
|
||||
# Defaults here had better match what mariadbd-safe will default to
|
||||
# The option values are generally defined on three important places
|
||||
# on the default installation:
|
||||
# 1) default values are hardcoded in the code of mariadbd daemon or
|
||||
# mariadbd-safe script
|
||||
# 2) configurable values are defined in @sysconfdir@/my.cnf
|
||||
# 3) default values for helper scripts are specified bellow
|
||||
# So, in case values are defined in my.cnf, we need to get that value.
|
||||
# In case they are not defined in my.cnf, we need to get the same value
|
||||
# in the daemon, as in the helper scripts. Thus, default values here
|
||||
# must correspond with values defined in mariadbd-safe script and source
|
||||
# code itself.
|
||||
|
||||
server_sections="mysqld_safe mysqld server mysqld-@MAJOR_VERSION@.@MINOR_VERSION@ mariadb mariadb-@MAJOR_VERSION@.@MINOR_VERSION@ mariadbd mariadbd-@MAJOR_VERSION@.@MINOR_VERSION@ client-server galera"
|
||||
|
||||
get_mysql_option "$server_sections" datadir "@MYSQL_DATADIR@"
|
||||
datadir="$result"
|
||||
|
||||
# if there is log_error in the my.cnf, my_print_defaults still
|
||||
# returns log-error
|
||||
# log-error might be defined in mysqld_safe and mysqld sections,
|
||||
# the former has bigger priority
|
||||
get_mysql_option "$server_sections" log-error "$datadir/`uname -n`.err"
|
||||
errlogfile="$result"
|
||||
|
||||
get_mysql_option "$server_sections" socket "@MYSQL_UNIX_ADDR@"
|
||||
socketfile="$result"
|
||||
|
||||
get_mysql_option "$server_sections" pid-file "$datadir/`uname -n`.pid"
|
||||
pidfile="$result"
|
||||
|
41
mariadb-scripts.patch
Normal file
41
mariadb-scripts.patch
Normal file
@ -0,0 +1,41 @@
|
||||
We have some downstream patches and other scripts that include variables to
|
||||
be expanded by cmake. Cmake needs to know about them, so adding them manually.
|
||||
|
||||
# Install libgcc as mylibgcc.a
|
||||
--- mariadb-10.5.5/scripts/CMakeLists.txt.old 2020-09-24 10:13:35.272589689 +0200
|
||||
+++ mariadb-10.5.5/scripts/CMakeLists.txt 2020-09-24 10:17:31.428985798 +0200
|
||||
@@ -377,6 +377,34 @@
|
||||
INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT})
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
+
|
||||
+ # files for systemd
|
||||
+ SET(SYSTEMD_SCRIPTS
|
||||
+ mariadb.tmpfiles.d
|
||||
+ mysql.service
|
||||
+ mysql@.service
|
||||
+ mariadb-prepare-db-dir
|
||||
+ mariadb-check-socket
|
||||
+ mariadb-check-upgrade
|
||||
+ mariadb-scripts-common
|
||||
+ mysql_config_multilib
|
||||
+ clustercheck
|
||||
+ galera_new_cluster
|
||||
+ my.cnf
|
||||
+ )
|
||||
+ FOREACH(file ${SYSTEMD_SCRIPTS})
|
||||
+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
|
||||
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
|
||||
+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.in)
|
||||
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.in
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
|
||||
+ ELSE()
|
||||
+ MESSAGE(FATAL_ERROR "Can not find ${file}.sh or ${file}.in in "
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}" )
|
||||
+ ENDIF()
|
||||
+ ENDFOREACH()
|
||||
+
|
||||
ENDIF()
|
||||
|
||||
# Install libgcc as mylibgcc.a
|
23
mariadb-server-galera.te
Normal file
23
mariadb-server-galera.te
Normal file
@ -0,0 +1,23 @@
|
||||
|
||||
module mariadb-server-galera 1.0;
|
||||
|
||||
require {
|
||||
type mysqld_t;
|
||||
type rsync_exec_t;
|
||||
type anon_inodefs_t;
|
||||
type proc_net_t;
|
||||
type kerberos_port_t;
|
||||
class file { read execute execute_no_trans getattr open };
|
||||
class tcp_socket { name_bind name_connect };
|
||||
class process { setpgid siginh rlimitinh noatsecure };
|
||||
}
|
||||
|
||||
# allow mysqld to run rsyncd
|
||||
allow mysqld_t self:process setpgid;
|
||||
allow mysqld_t rsync_exec_t:file { read execute execute_no_trans getattr open };
|
||||
allow mysqld_t anon_inodefs_t:file getattr;
|
||||
allow mysqld_t proc_net_t:file { read open };
|
||||
|
||||
# allow rsyncd to listen on port 4444
|
||||
allow mysqld_t kerberos_port_t:tcp_socket { name_bind name_connect };
|
||||
|
13
mariadb-ssl-cipher-tests.patch
Normal file
13
mariadb-ssl-cipher-tests.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff -up mariadb-10.3.9/mysql-test/main/ssl_cipher.test.fixtest mariadb-10.3.9/mysql-test/main/ssl_cipher.test
|
||||
--- mariadb-10.3.13/mysql-test/main/ssl_cipher.test 2019-02-20 08:59:09.000000000 +0100
|
||||
+++ mariadb-10.3.13/mysql-test/main/ssl_cipher.test_patched 2019-02-22 11:22:01.250256060 +0100
|
||||
@@ -97,7 +97,9 @@ drop user mysqltest_1@localhost;
|
||||
let $restart_parameters=--ssl-cipher=AES128-SHA;
|
||||
source include/restart_mysqld.inc;
|
||||
connect (ssl_con,localhost,root,,,,,SSL);
|
||||
+--replace_regex /TLS_AES_.*/AES128-SHA/
|
||||
SHOW STATUS LIKE 'Ssl_cipher';
|
||||
+--replace_regex /TLS_AES_.*/AES128-SHA/
|
||||
SHOW STATUS LIKE 'Ssl_cipher_list';
|
||||
disconnect ssl_con;
|
||||
connection default;
|
21
mariadb-ssl-cypher.patch
Normal file
21
mariadb-ssl-cypher.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff -up mariadb-10.1.19/mysql-test/r/ssl_8k_key.result.sslbak mariadb-10.1.19/mysql-test/r/ssl_8k_key.result
|
||||
--- mariadb-10.1.19/mysql-test/r/ssl_8k_key.result.sslbak 2016-11-24 08:55:21.637000000 -0500
|
||||
+++ mariadb-10.1.19/mysql-test/r/ssl_8k_key.result 2016-11-24 08:55:55.853000000 -0500
|
||||
@@ -1,2 +1,2 @@
|
||||
-Variable_name Value
|
||||
-Ssl_cipher DHE-RSA-AES256-SHA
|
||||
+have_ssl
|
||||
+1
|
||||
diff -up mariadb-10.1.19/mysql-test/t/ssl_8k_key.test.sslbak mariadb-10.1.19/mysql-test/t/ssl_8k_key.test
|
||||
--- mariadb-10.1.19/mysql-test/t/ssl_8k_key.test.sslbak 2016-11-24 08:54:10.485000000 -0500
|
||||
+++ mariadb-10.1.19/mysql-test/t/ssl_8k_key.test 2016-11-24 08:54:35.724000000 -0500
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
# Bug#29784 YaSSL assertion failure when reading 8k key.
|
||||
#
|
||||
---exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
|
||||
+--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1
|
||||
|
||||
## This test file is for testing encrypted communication only, not other
|
||||
## encryption routines that the SSL library happens to provide!
|
||||
|
79
mariadb.rpmlintrc
Normal file
79
mariadb.rpmlintrc
Normal file
@ -0,0 +1,79 @@
|
||||
# THIS FILE SERVES FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON
|
||||
# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors
|
||||
|
||||
# (same file in python3 package served as a great example)
|
||||
|
||||
|
||||
|
||||
# Spelling errors
|
||||
addFilter(r'spelling-error .* en_US (cnf|mysqld|benchmarking|pam|passwordless|subpackage|libmariadb|mariadbd) ')
|
||||
|
||||
# Debugsource
|
||||
addFilter(r'^mariadb.*debugsource\.[^:]+: (E|W): no-documentation')
|
||||
# Debuginfo
|
||||
addFilter(r'^mariadb.*debuginfo\.[^:]+: (E|W): useless-provides debuginfo\(build-id\)')
|
||||
# Debug symlinks
|
||||
addFilter(r'dangling-relative-symlink /usr/lib/.build-id')
|
||||
|
||||
# Testsuite
|
||||
# Some expected tests results are zero-length files
|
||||
addFilter(r'(zero-length|pem-certificate) /usr/share/mysql-test/*')
|
||||
|
||||
# Chroot function
|
||||
# False positive; checked by upstream
|
||||
addFilter(r'missing-call-to-chdir-with-chroot')
|
||||
|
||||
# Missing documentation
|
||||
# I don't think that's on the upstream priority list
|
||||
addFilter(r'no-documentation')
|
||||
addFilter(r'no-manual-page-for-binary')
|
||||
|
||||
# Obsoleted not provided
|
||||
# Obsoleting upstream packages, not providing them is expected to not mix them up
|
||||
addFilter(r'obsolete-not-provided MySQL')
|
||||
# Provided by mariadb-connector-c
|
||||
addFilter(r'obsolete-not-provided mariadb-libs')
|
||||
# Upstream dropped support
|
||||
addFilter(r'obsolete-not-provided mariadb-bench')
|
||||
addFilter(r'obsolete-not-provided mariadb-tokudb-engine')
|
||||
|
||||
# Config file without noreplace flag
|
||||
# Don't replace logs that may contain old entries
|
||||
addFilter(r'conffile-without-noreplace-flag /var/log/mariadb/mariadb.log')
|
||||
|
||||
# Log rotation
|
||||
# MariaDB log rotation script is commented out, because it is still not ready for big industry usage.
|
||||
# Let the user decide, if they want to enable it (uncomment it)
|
||||
addFilter(r'incoherent-logrotate-file /etc/logrotate.d/mariadb')
|
||||
|
||||
# Permissions
|
||||
# wsrep_sst_common
|
||||
# It contains a parser of arguments for other sst scripts.
|
||||
# It is meant to be sourced, not to be executed alone.
|
||||
# So it correctly does not have shebang nor executable bit.
|
||||
addFilter(r'non-executable-in-bin /usr/bin/wsrep_sst_common 644')
|
||||
addFilter(r'script-without-shebang /usr/bin/wsrep_sst_common')
|
||||
addFilter(r'non-executable-script /usr/bin/wsrep_sst_common 644 None')
|
||||
# mariadb-scripts-common has a similar issue
|
||||
addFilter(r'non-executable-script /usr/libexec/mariadb-scripts-common 644 /bin/sh')
|
||||
# Seems pretty standard to me ...
|
||||
addFilter(r'non-standard-dir-perm /var/log/mariadb 750')
|
||||
# 640 is IMO also prety OK
|
||||
addFilter(r'non-readable /etc/sysconfig/clustercheck 640')
|
||||
|
||||
# Unversioned bundles
|
||||
# RocksDB has so rapid developement, it it not compatible through versions.
|
||||
# That means we need to stick to the exact verison upstream use.
|
||||
addFilter(r'unversioned-explicit-provides bundled\(rocksdb\)')
|
||||
|
||||
# Testsuite errors
|
||||
addFilter(r'non-executable-script /usr/share/mysql-test')
|
||||
addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test')
|
||||
|
||||
# Comments at the end of RPM %endif tags
|
||||
addFilter(r'extra tokens at the end of %endif directive')
|
||||
|
||||
# PAM plugin specialities - all expected
|
||||
addFilter(r'non-conffile-in-etc /etc/security/user_map.conf')
|
||||
addFilter(r'setuid-binary /usr/lib64/mariadb/plugin/auth_pam_tool_dir/auth_pam_tool')
|
||||
addFilter(r'non-standard-executable-perm /usr/lib64/mariadb/plugin/auth_pam_tool_dir/auth_pam_tool')
|
2925
mariadb.spec
Normal file
2925
mariadb.spec
Normal file
File diff suppressed because it is too large
Load Diff
3
mariadb.tmpfiles.d.in
Normal file
3
mariadb.tmpfiles.d.in
Normal file
@ -0,0 +1,3 @@
|
||||
# Do not edit this file.
|
||||
# To override this, put /etc/tmpfiles.d/mariadb.conf instead.
|
||||
d @PID_FILE_DIR@ 0755 mysql mysql -
|
18
my.cnf.in
Normal file
18
my.cnf.in
Normal file
@ -0,0 +1,18 @@
|
||||
#
|
||||
# This group is read both both by the client and the server
|
||||
# use it for options that affect everything
|
||||
#
|
||||
[client-server]
|
||||
|
||||
#
|
||||
# This group is read by the server
|
||||
#
|
||||
[mysqld]
|
||||
# Disabling symbolic-links is recommended to prevent assorted security risks
|
||||
symbolic-links=0
|
||||
|
||||
#
|
||||
# include all files from the config directory
|
||||
#
|
||||
!includedir @INSTALL_SYSCONF2DIR@
|
||||
|
64
mysql.service.in
Normal file
64
mysql.service.in
Normal file
@ -0,0 +1,64 @@
|
||||
# It's not recommended to modify this file in-place, because it will be
|
||||
# overwritten during package upgrades. If you want to customize, the
|
||||
# best way is to:
|
||||
#
|
||||
# root> systemctl edit @DAEMON_NAME@.service
|
||||
#
|
||||
# Then add additonal directives under a section (probably [Service]).
|
||||
#
|
||||
# For more info about custom unit files, see systemd.unit(5) or
|
||||
# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
|
||||
#
|
||||
# For example, if you want to increase MariaDB's open-files-limit to 10000,
|
||||
# you need to increase systemd's LimitNOFILE setting, use the contents below:
|
||||
#
|
||||
# [Service]
|
||||
# LimitNOFILE=10000
|
||||
#
|
||||
|
||||
[Unit]
|
||||
Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
|
||||
Documentation=man:mariadbd(8)
|
||||
Documentation=https://mariadb.com/kb/en/library/systemd/
|
||||
After=network.target
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Alias=mysql.service
|
||||
Alias=mysqld.service
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
User=mysql
|
||||
Group=mysql
|
||||
|
||||
ExecStartPre=@libexecdir@/mariadb-check-socket
|
||||
# '%n' expands to 'Full unit name'; man systemd.unit
|
||||
ExecStartPre=@libexecdir@/mariadb-prepare-db-dir %n
|
||||
# MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
|
||||
# Note: we set --basedir to prevent probes that might trigger SELinux alarms,
|
||||
# per bug #547485
|
||||
ExecStart=@libexecdir@/mariadbd --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
|
||||
ExecStartPost=@libexecdir@/mariadb-check-upgrade
|
||||
|
||||
# Setting this to true can break replication and the Type=notify settings
|
||||
# See also bind-address MariaDB option.
|
||||
PrivateNetwork=false
|
||||
|
||||
KillSignal=SIGTERM
|
||||
|
||||
# Don't want to see an automated SIGKILL ever
|
||||
SendSIGKILL=no
|
||||
|
||||
# Restart crashed server only, on-failure would also restart, for example, when
|
||||
# my.cnf contains unknown option
|
||||
Restart=on-abort
|
||||
RestartSec=5s
|
||||
|
||||
UMask=007
|
||||
|
||||
# Give a reasonable amount of time for the server to start up/shut down
|
||||
TimeoutSec=300
|
||||
|
||||
# Place temp files in a secure directory, not /tmp
|
||||
PrivateTmp=true
|
85
mysql@.service.in
Normal file
85
mysql@.service.in
Normal file
@ -0,0 +1,85 @@
|
||||
# Multi instance version of MariaDB. For if you run mutiple verions at once.
|
||||
# Also used for @DAEMON_NAME@@bootstrap to bootstrap Galera.
|
||||
#
|
||||
# To use multi instance variant, use [mariadbd.INSTANCENAME] as sections in
|
||||
# @sysconfdir@/@my.cnf to change per instance settings. A minimumal necessary
|
||||
# configuration items to change to avoid conflicts between instances is:
|
||||
#
|
||||
# [mariadbd.instancename]
|
||||
# # TCP port to make available for clients
|
||||
# port=3306
|
||||
# # Socket to make available for clients
|
||||
# socket=/tmp/mariadb-instancename.sock
|
||||
# # Where MariaDB should store all its data
|
||||
# datadir=/usr/local/mariadb-instancename/data
|
||||
#
|
||||
# and start the service via:
|
||||
#
|
||||
# root> systemctl start @DAEMON_NAME@@{instancename}.server
|
||||
#
|
||||
# It's not recommended to modify this file in-place, because it will be
|
||||
# overwritten during package upgrades. If you want to customize, for
|
||||
# all instances, the best way is:
|
||||
#
|
||||
# root> systemctl edit @DAEMON_NAME@@.service
|
||||
#
|
||||
# Then add additonal directives under a section (probably [Service]).
|
||||
#
|
||||
# If you only want to change a specific instance:
|
||||
#
|
||||
# root> systemctl edit @DAEMON_NAME@@{instancename}.server
|
||||
#
|
||||
# For more info about custom unit files, see systemd.unit(5) or
|
||||
# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
|
||||
#
|
||||
# For example, if you want to increase MariaDB's open-files-limit to 10000,
|
||||
# you need to increase systemd's LimitNOFILE setting, use the contents below:
|
||||
#
|
||||
# [Service]
|
||||
# LimitNOFILE=10000
|
||||
|
||||
[Unit]
|
||||
Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
|
||||
Documentation=man:mariadbd(8)
|
||||
Documentation=https://mariadb.com/kb/en/library/systemd/
|
||||
After=network.target
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Alias=mysql.service
|
||||
Alias=mysqld.service
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
User=mysql
|
||||
Group=mysql
|
||||
|
||||
ExecStartPre=@libexecdir@/mariadb-check-socket --defaults-group-suffix=.%I
|
||||
ExecStartPre=@libexecdir@/mariadb-prepare-db-dir --defaults-group-suffix=.%I %n
|
||||
# MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
|
||||
# Note: we set --basedir to prevent probes that might trigger SELinux alarms,
|
||||
# per bug #547485
|
||||
ExecStart=@libexecdir@/mariadbd --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
|
||||
ExecStartPost=@libexecdir@/mariadb-check-upgrade --defaults-group-suffix=.%I
|
||||
|
||||
# Setting this to true can break replication and the Type=notify settings
|
||||
# See also bind-address MariaDB option.
|
||||
PrivateNetwork=false
|
||||
|
||||
KillSignal=SIGTERM
|
||||
|
||||
# Don't want to see an automated SIGKILL ever
|
||||
SendSIGKILL=no
|
||||
|
||||
# Restart crashed server only, on-failure would also restart, for example, when
|
||||
# my.cnf contains unknown option
|
||||
Restart=on-abort
|
||||
RestartSec=5s
|
||||
|
||||
UMask=007
|
||||
|
||||
# Give a reasonable amount of time for the server to start up/shut down
|
||||
TimeoutSec=300
|
||||
|
||||
# Place temp files in a secure directory, not /tmp
|
||||
PrivateTmp=true
|
26
mysql_config_multilib.sh
Normal file
26
mysql_config_multilib.sh
Normal file
@ -0,0 +1,26 @@
|
||||
#! /bin/sh
|
||||
#
|
||||
# Wrapper script for mysql_config to support multilib
|
||||
#
|
||||
# This command respects setarch
|
||||
|
||||
bits=$(rpm --eval %__isa_bits)
|
||||
|
||||
case $bits in
|
||||
32|64) status=known ;;
|
||||
*) status=unknown ;;
|
||||
esac
|
||||
|
||||
if [ "$status" = "unknown" ] ; then
|
||||
echo "$0: error: command 'rpm --eval %__isa_bits' returned unknown value: $bits"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
if [ -x @bindir@/mysql_config-$bits ] ; then
|
||||
@bindir@/mysql_config-$bits "$@"
|
||||
else
|
||||
echo "$0: error: needed binary: @bindir@/mysql_config-$bits is missing"
|
||||
exit 1
|
||||
fi
|
||||
|
0
rh-skipped-tests-arm.list
Normal file
0
rh-skipped-tests-arm.list
Normal file
93
rh-skipped-tests-base.list
Normal file
93
rh-skipped-tests-base.list
Normal file
@ -0,0 +1,93 @@
|
||||
# The SSL test are failing correctly. Fro more explanation, see:
|
||||
# https://jira.mariadb.org/browse/MDEV-8404?focusedCommentId=84275&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-84275
|
||||
main.ssl_7937 : #1399847
|
||||
main.ssl_8k_key :
|
||||
main.ssl_crl : #1399847
|
||||
|
||||
# ------------------------------
|
||||
# Tests that fails because of 'Self Signed Certificate in the Certificate Chain'
|
||||
perfschema.cnf_option :
|
||||
|
||||
rpl.rpl_row_img_blobs :
|
||||
rpl.rpl_row_img_eng_min :
|
||||
rpl.rpl_row_img_eng_noblob :
|
||||
|
||||
sys_vars.slave_parallel_threads_basic :
|
||||
|
||||
# ------------------------------
|
||||
# Expected to fail, the plugin is not build with server, but 'mariadb-connector-c' instead
|
||||
plugins.auth_ed25519 :
|
||||
plugins.multiauth :
|
||||
|
||||
# ------------------------------
|
||||
perfschema.nesting : #1399847
|
||||
perfschema.socket_summary_by_instance_func : #1399847
|
||||
perfschema.socket_summary_by_event_name_func :
|
||||
|
||||
# ------------------------------
|
||||
# Fails since 10.1.12
|
||||
innodb.innodb_defrag_binlog :
|
||||
|
||||
# Fails everywhere since 10.4.11
|
||||
sys_vars.tcp_nodelay :
|
||||
|
||||
# Fails since 10.5.3
|
||||
main.mysqld--help-aria :
|
||||
|
||||
# Fails since 10.5.4
|
||||
main.ssl_system_ca :
|
||||
|
||||
# Fails on all architectures since 10.5.13
|
||||
oqgraph.regression_mdev6345 :
|
||||
type_test.type_test_double :
|
||||
# Fails on i686 since 10.5.13
|
||||
oqgraph.general-innodb :
|
||||
oqgraph.general-Aria :
|
||||
oqgraph.general-MyISAM :
|
||||
oqgraph.legacy_upgrade :
|
||||
oqgraph.regression_1133093 :
|
||||
oqgraph.regression_1196036 :
|
||||
oqgraph.regression_1213120 :
|
||||
|
||||
# Fails on all architectures since 10.5.18
|
||||
main.loadxml :
|
||||
main.lock_kill :
|
||||
|
||||
# Fails since 10.5.20
|
||||
innodb.innodb_bug51920 :
|
||||
binlog_encryption.rpl_cant_read_event_incident :
|
||||
bg.spider_fixes :
|
||||
bugfix.mdev_29904 : "[Warning] mariadbd: Can't get hardware address with error 0"
|
||||
sys_vars.completion_type_func :
|
||||
rpl.rpl_report_port :
|
||||
rpl.rpl_reset_slave_fail :
|
||||
rpl.rpl_xa_survive_disconnect_lsu_off :
|
||||
rpl.rpl_heartbeat_basic :
|
||||
rpl.rpl_xa_survive_disconnect :
|
||||
rpl.rpl_err_ignoredtable :
|
||||
rpl.rpl_row_img_sequence_full :
|
||||
rpl.rpl_row_img_sequence_min :
|
||||
rpl.rpl_row_img_sequence_noblob :
|
||||
rpl.rpl_xa_empty_transaction :
|
||||
rpl.rpl_slave_shutdown_mdev20821 :
|
||||
|
||||
# Fails on 10.11.6
|
||||
main.plugin_auth :
|
||||
main.userstat :
|
||||
main.information_schema :
|
||||
main.func_sformat :
|
||||
|
||||
binlog_encryption.rpl_gtid_basic :
|
||||
multi_source.info_logs :
|
||||
perfschema.threads_mysql :
|
||||
rpl.rpl_cant_read_event_incident :
|
||||
rpl.rpl_change_master_demote :
|
||||
rpl.rpl_domain_id_filter_restart :
|
||||
rpl.rpl_gtid_basic :
|
||||
rpl.rpl_mdev6020 :
|
||||
rpl.rpl_old_master :
|
||||
rpl.rpl_perfschema_applier_status_by_coordinator :
|
||||
rpl.rpl_rewrite_db_sys_vars :
|
||||
rpl.rpl_semi_sync_wait_point :
|
||||
rpl.rpl_trigger :
|
||||
rpl.rpl_upgrade_master_info :
|
7
rh-skipped-tests-ppc.list
Normal file
7
rh-skipped-tests-ppc.list
Normal file
@ -0,0 +1,7 @@
|
||||
# Fails since 10.5.20
|
||||
innodb.innodb_defrag_concurrent :
|
||||
parts.partition_alter4_innodb :
|
||||
rpl.rpl_parallel_optimistic_xa_lsu_off :
|
||||
|
||||
# Fails on 10.11.6
|
||||
perfschema.threads_innodb :
|
12
rh-skipped-tests-s390.list
Normal file
12
rh-skipped-tests-s390.list
Normal file
@ -0,0 +1,12 @@
|
||||
# Fails since 10.5.2
|
||||
perfschema.memory_aggregate_32bit :
|
||||
period.overlaps :
|
||||
|
||||
# Fails on 10.11.6
|
||||
main.func_json_notembedded :
|
||||
main.analyze_stmt_slow_query_log :
|
||||
|
||||
innodb_gis.rtree_rollback1 :
|
||||
mariabackup.encrypted_page_corruption :
|
||||
mariabackup.huge_lsn :
|
||||
mariabackup.xb_file_key_management :
|
164
rocksdb-6.8-gcc13.patch
Normal file
164
rocksdb-6.8-gcc13.patch
Normal file
@ -0,0 +1,164 @@
|
||||
diff --git a/db/compaction/compaction_iteration_stats.h b/db/compaction/compaction_iteration_stats.h
|
||||
index 963c1d8eb..79acbec6a 100644
|
||||
--- a/db/compaction/compaction_iteration_stats.h
|
||||
+++ b/db/compaction/compaction_iteration_stats.h
|
||||
@@ -5,6 +5,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
#include "rocksdb/rocksdb_namespace.h"
|
||||
|
||||
struct CompactionIterationStats {
|
||||
diff --git a/include/rocksdb/thread_status.h b/include/rocksdb/thread_status.h
|
||||
index 6b2f5c885..bb2de6c7b 100644
|
||||
--- a/include/rocksdb/thread_status.h
|
||||
+++ b/include/rocksdb/thread_status.h
|
||||
@@ -13,13 +13,15 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
-#include <stdint.h>
|
||||
#include <cstddef>
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
+#include "rocksdb/rocksdb_namespace.h"
|
||||
+
|
||||
#if !defined(ROCKSDB_LITE) && !defined(NROCKSDB_THREAD_STATUS) && \
|
||||
defined(ROCKSDB_SUPPORT_THREAD_LOCAL)
|
||||
#define ROCKSDB_USING_THREAD_STATUS
|
||||
diff --git a/include/rocksdb/universal_compaction.h b/include/rocksdb/universal_compaction.h
|
||||
index e3aeee6ce..58323f2d9 100644
|
||||
--- a/include/rocksdb/universal_compaction.h
|
||||
+++ b/include/rocksdb/universal_compaction.h
|
||||
@@ -5,10 +5,12 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
-#include <stdint.h>
|
||||
#include <climits>
|
||||
+#include <cstdint>
|
||||
#include <vector>
|
||||
|
||||
+#include "rocksdb/rocksdb_namespace.h"
|
||||
+
|
||||
namespace ROCKSDB_NAMESPACE {
|
||||
|
||||
//
|
||||
diff --git a/include/rocksdb/utilities/checkpoint.h b/include/rocksdb/utilities/checkpoint.h
|
||||
index c7f93b4cf..3c2ab8053 100644
|
||||
--- a/include/rocksdb/utilities/checkpoint.h
|
||||
+++ b/include/rocksdb/utilities/checkpoint.h
|
||||
@@ -8,6 +8,7 @@
|
||||
#pragma once
|
||||
#ifndef ROCKSDB_LITE
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include "rocksdb/status.h"
|
||||
diff --git a/include/rocksdb/utilities/ldb_cmd_execute_result.h b/include/rocksdb/utilities/ldb_cmd_execute_result.h
|
||||
index c837b47f7..57bac3346 100644
|
||||
--- a/include/rocksdb/utilities/ldb_cmd_execute_result.h
|
||||
+++ b/include/rocksdb/utilities/ldb_cmd_execute_result.h
|
||||
@@ -5,6 +5,10 @@
|
||||
//
|
||||
#pragma once
|
||||
|
||||
+#include <string>
|
||||
+
|
||||
+#include "rocksdb/rocksdb_namespace.h"
|
||||
+
|
||||
#ifdef FAILED
|
||||
#undef FAILED
|
||||
#endif
|
||||
diff --git a/memory/memory_usage.h b/memory/memory_usage.h
|
||||
index 15e8b87cd..4c73cd40b 100644
|
||||
--- a/memory/memory_usage.h
|
||||
+++ b/memory/memory_usage.h
|
||||
@@ -5,8 +5,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstddef>
|
||||
#include <unordered_map>
|
||||
|
||||
+#include "rocksdb/rocksdb_namespace.h"
|
||||
+
|
||||
namespace ROCKSDB_NAMESPACE {
|
||||
|
||||
// Helper methods to estimate memroy usage by std containers.
|
||||
diff --git a/table/block_based/data_block_hash_index.h b/table/block_based/data_block_hash_index.h
|
||||
index f356395f3..321522175 100644
|
||||
--- a/table/block_based/data_block_hash_index.h
|
||||
+++ b/table/block_based/data_block_hash_index.h
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
diff --git a/util/crc32c_ppc.h b/util/crc32c_ppc.h
|
||||
index c359061c6..5cb12c89a 100644
|
||||
--- a/util/crc32c_ppc.h
|
||||
+++ b/util/crc32c_ppc.h
|
||||
@@ -7,6 +7,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstddef>
|
||||
+#include <cstdint>
|
||||
+
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
diff --git a/util/string_util.h b/util/string_util.h
|
||||
index a761be66c..064d059f0 100644
|
||||
--- a/util/string_util.h
|
||||
+++ b/util/string_util.h
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
diff --git a/utilities/blob_db/blob_db_gc_stats.h b/utilities/blob_db/blob_db_gc_stats.h
|
||||
index 1e6e4a25d..fea6b0032 100644
|
||||
--- a/utilities/blob_db/blob_db_gc_stats.h
|
||||
+++ b/utilities/blob_db/blob_db_gc_stats.h
|
||||
@@ -5,6 +5,10 @@
|
||||
//
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
+
|
||||
+#include "rocksdb/rocksdb_namespace.h"
|
||||
+
|
||||
#ifndef ROCKSDB_LITE
|
||||
|
||||
namespace ROCKSDB_NAMESPACE {
|
||||
diff --git a/utilities/cassandra/serialize.h b/utilities/cassandra/serialize.h
|
||||
index cd980ade0..8f50a02dd 100644
|
||||
--- a/utilities/cassandra/serialize.h
|
||||
+++ b/utilities/cassandra/serialize.h
|
||||
@@ -10,6 +10,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
+#include <string>
|
||||
+
|
||||
+#include "rocksdb/rocksdb_namespace.h"
|
||||
+
|
||||
namespace ROCKSDB_NAMESPACE {
|
||||
namespace cassandra {
|
||||
namespace {
|
50
rpminspect.yaml
Normal file
50
rpminspect.yaml
Normal file
@ -0,0 +1,50 @@
|
||||
# Set up global ignore list
|
||||
ignore:
|
||||
# mysql-test/ directory contains an extensive test-suite of about 20.000 files;
|
||||
# It is very time consuming to be fully analysed and the results aren't useful anyway
|
||||
# It is expected the tests change during rebases, as the underlying functionality the test evolve
|
||||
# Some of the tests contain broken or problematic code, however that is on purpose
|
||||
- /usr/share/mysql-test/
|
||||
|
||||
# based on https://lists.launchpad.net/maria-discuss/msg06133.html discussion
|
||||
# are the invalid xmls (except for Index.xml) present in the sources on purpose
|
||||
# and they can be removed from xmllint rpminspect check in the CI process.
|
||||
#
|
||||
# A bug report [https://jira.mariadb.org/browse/MDEV-26905] was created in the upstream
|
||||
# for the Index.xml file.
|
||||
#
|
||||
# Fedora CI picks up the rpmlimspect.yaml for specific package in the dist-git repo
|
||||
#[ref: https://rpminspect.readthedocs.io/en/latest/configuration.html#rpminspect-yaml]
|
||||
#
|
||||
xml:
|
||||
ignore:
|
||||
- /usr/share/mysql-test/std_data/loadxml.dat
|
||||
- /usr/share/mysql-test/std_data/loaddata/mdev9874.xml
|
||||
- /usr/share/mysql-test/std_data/ldml/Index.xml
|
||||
- /usr/share/mysql-test/plugin/sphinx/sphinx/testdata.xml
|
||||
- /usr/share/mysql-test/plugin/connect/connect/std_data/nocs.xml
|
||||
- /usr/share/mariadb/charsets/Index.xml
|
||||
|
||||
# ignore bad functions in resolveip binary, based on BZ1973194
|
||||
# all forbidden functions listed in main rpminspect config
|
||||
# have to be menioned also here, else it would not be checked for them
|
||||
badfuncs:
|
||||
- gethostbyname
|
||||
- gethostbyname2
|
||||
- gethostbyaddr
|
||||
- inet_addr
|
||||
- inet_aton
|
||||
- inet_nsap_addr
|
||||
- inet_ntoa
|
||||
- inet_nsap_ntoa
|
||||
- inet_makeaddr
|
||||
- inet_netof
|
||||
- inet_network
|
||||
- inet_neta
|
||||
- inet_net_ntop
|
||||
- inet_net_pton
|
||||
- rcmd
|
||||
- rexec
|
||||
- rresvport
|
||||
ignore:
|
||||
- /usr/bin/resolveip
|
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
||||
SHA512 (mariadb-10.11.6.tar.gz) = 3d77f7be4a26d5a36af56150a5f8ed5e21adeed9bc8ea1bd694e47a25a571bd73468eada7c96e0dfe5a6c81bef625abf71a56d228cf43a738e555e3c0d824a6a
|
62
tests/basic_service/Makefile
Normal file
62
tests/basic_service/Makefile
Normal file
@ -0,0 +1,62 @@
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Makefile of /CoreOS/tests/Sanity/basic_service
|
||||
# Description: The very basic service testing
|
||||
# Author: Michal Schorm <mschorm@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2018 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation, either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
export TEST=basic_service
|
||||
export TESTVERSION=1.0
|
||||
|
||||
BUILT_FILES=
|
||||
|
||||
FILES=$(METADATA) runtest.sh Makefile PURPOSE
|
||||
|
||||
.PHONY: all install download clean
|
||||
|
||||
run: $(FILES) build
|
||||
./runtest.sh
|
||||
|
||||
build: $(BUILT_FILES)
|
||||
test -x runtest.sh || chmod a+x runtest.sh
|
||||
|
||||
clean:
|
||||
rm -f *~ $(BUILT_FILES)
|
||||
|
||||
|
||||
include /usr/share/rhts/lib/rhts-make.include
|
||||
|
||||
$(METADATA): Makefile
|
||||
@echo "Owner: Michal Schorm <mschorm@redhat.com>" > $(METADATA)
|
||||
@echo "Name: $(TEST)" >> $(METADATA)
|
||||
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
|
||||
@echo "Path: $(TEST_DIR)" >> $(METADATA)
|
||||
@echo "Description: The very basic service testing" >> $(METADATA)
|
||||
@echo "Type: Sanity" >> $(METADATA)
|
||||
@echo "TestTime: 5m" >> $(METADATA)
|
||||
@echo "RunFor: mariadb" >> $(METADATA)
|
||||
@echo "Requires: mariadb" >> $(METADATA)
|
||||
@echo "Priority: Normal" >> $(METADATA)
|
||||
@echo "License: GPLv2+" >> $(METADATA)
|
||||
@echo "Confidential: no" >> $(METADATA)
|
||||
@echo "Destructive: no" >> $(METADATA)
|
||||
|
||||
rhts-lint $(METADATA)
|
3
tests/basic_service/PURPOSE
Normal file
3
tests/basic_service/PURPOSE
Normal file
@ -0,0 +1,3 @@
|
||||
PURPOSE of basic_service
|
||||
Description: The very basic service testing
|
||||
Author: Michal Schorm <mschorm@redhat.com>
|
72
tests/basic_service/runtest.sh
Executable file
72
tests/basic_service/runtest.sh
Executable file
@ -0,0 +1,72 @@
|
||||
#!/bin/bash
|
||||
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# runtest.sh of basic_service
|
||||
# Description: The very basic service testing
|
||||
# Author: Michal Schorm <mschorm@redhat.com>
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
# Copyright (c) 2018 Red Hat, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License as
|
||||
# published by the Free Software Foundation, either version 2 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be
|
||||
# useful, but WITHOUT ANY WARRANTY; without even the implied
|
||||
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
# PURPOSE. See the GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||
#
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
# Include Beaker environment
|
||||
. /usr/bin/rhts-environment.sh || exit 1
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
PACKAGE="mariadb"
|
||||
|
||||
rlJournalStart
|
||||
rlPhaseStartSetup
|
||||
rlAssertRpm $PACKAGE
|
||||
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
|
||||
rlRun "systemctl stop mariadb"
|
||||
rlRun "pushd $TmpDir"
|
||||
rlPhaseEnd
|
||||
|
||||
|
||||
|
||||
rlPhaseStartTest
|
||||
rlRun "systemctl -q status mariadb" 3 "Test status of dead service"
|
||||
rlRun "systemctl -q start mariadb" 0 "Start mariadb service"
|
||||
rlRun "systemctl -q status mariadb" 0 "Test status of running mariadb service"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest
|
||||
rlRun "systemctl -q restart mariadb" 0 "Restart running mariadb service"
|
||||
rlRun "systemctl -q status mariadb" 0 "Test status of running mariadb service"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest
|
||||
rlRun "systemctl -q stop mariadb" 0 "Stop mariadb service"
|
||||
rlRun "systemctl -q status mariadb" 3 "Test status of dead mariadb service"
|
||||
rlPhaseEnd
|
||||
|
||||
rlPhaseStartTest
|
||||
rlRun "systemctl -q start mariadb" 0 "Start mariadb service"
|
||||
rlRun "systemctl -q status mariadb" 0 "Test status of running mariadb service"
|
||||
rlPhaseEnd
|
||||
|
||||
|
||||
|
||||
rlPhaseStartCleanup
|
||||
rlRun "popd"
|
||||
rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
|
||||
rlPhaseEnd
|
||||
rlJournalPrintText
|
||||
rlJournalEnd
|
30
tests/tests.yml
Normal file
30
tests/tests.yml
Normal file
@ -0,0 +1,30 @@
|
||||
---
|
||||
|
||||
# --------------------------------------------------
|
||||
# This is an experiment with Fedora CI
|
||||
#
|
||||
# Refer to:
|
||||
# https://fedoraproject.org/wiki/CI/Tests
|
||||
#
|
||||
# TL;DR you have to, as root:
|
||||
# 1) # dnf install ansible python2-dnf libselinux-python standard-test-roles
|
||||
# 2) install the packages to be tested
|
||||
# 3) # ansible-playbook tests.yml
|
||||
#
|
||||
# Warning !!
|
||||
# DO NOT run it on a machine that SHOULD NOT be destroyed.
|
||||
#
|
||||
# --------------------------------------------------
|
||||
|
||||
# Tests that run in classic context
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-beakerlib
|
||||
tags:
|
||||
- classic
|
||||
tests:
|
||||
- basic_service
|
||||
required_packages:
|
||||
- mariadb
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user