openstack
/
openstack-helm-infra
Code Issues Proposed changes

Merge "MariaDB: Move to use mariabackup instead of xtrabackup-v2"

This commit is contained in:
Zuul 2018-10-25 13:44:16 +00:00 committed by Gerrit Code Review
parent f8ac6c3f21 8bc03bf88c
commit 1ec8981aa4
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mariadb/templates/bin/_readiness.sh.tpl
View File

@ -33,12 +33,16 @@ if ! $MYSQL -e 'select 1' > /dev/null 2>&1 ; then
exit 1
fi
if [ "x$(mysql_status_query wsrep_cluster_status)" != "xPrimary" ]; then
# Not in primary cluster
if [ "x$(mysql_status_query wsrep_ready)" != "xON" ]; then
# WSREP says the node can receive queries
exit 1
fi
if [ "x$(mysql_status_query wsrep_ready)" != "xON" ]; then
# WSREP not ready
if [ "x$(mysql_status_query wsrep_connected)" != "xON" ]; then
# WSREP connected
exit 1
fi
if [ "x$(mysql_status_query wsrep_cluster_status)" != "xPrimary" ]; then
# Not in primary cluster
exit 1
fi
if [ "x$(mysql_status_query wsrep_local_state_comment)" != "xSynced" ]; then

3
mariadb/templates/etc/_00-base.cnf.tpl
View File

@ -93,8 +93,9 @@ wsrep_on=1
wsrep_provider=/usr/lib/galera/libgalera_smm.so
wsrep_provider_options="gmcast.listen_addr=tcp://0.0.0.0:{{ tuple "oslo_db" "direct" "wsrep" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}"
wsrep_slave_threads=12
# FIX_ME(portdirect): https://mariadb.com/kb/en/library/mariabackup-overview/#granting-privileges-for-ssts
wsrep_sst_auth=root:{{ .Values.endpoints.oslo_db.auth.admin.password }}
wsrep_sst_method=xtrabackup-v2
wsrep_sst_method=mariabackup
[mysqldump]
max-allowed-packet=16M