openstack/openstack-helm
Code Issues Proposed changes

Merge "MariaDB: Update to 10.2.13; patching wsrep_sst_xtrabackup-v2"

Browse Source
This commit is contained in:
Zuul 2018-03-22 18:14:41 +00:00 committed by Gerrit Code Review
commit 7c8491f1f7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mariadb/templates/bin/_start.sh.tpl
View File

@ -17,6 +17,12 @@ limitations under the License.
set -xe
# MariaDB 10.2.13 has a regression which breaks clustering, patch
# around this for now
if /usr/sbin/mysqld --version | grep --silent 10.2.13 ; then
sed -i 's^LSOF_OUT=.*^LSOF_OUT=$(lsof -sTCP:LISTEN -i TCP:${PORT} -a -c nc -c socat -F c 2> /dev/null || :)^' /usr/bin/wsrep_sst_xtrabackup-v2
fi
# Bootstrap database
CLUSTER_INIT_ARGS=""
CLUSTER_CONFIG_PATH=/etc/mysql/conf.d/10-cluster-config.cnf

7
mariadb/values.yaml
View File

@ -14,8 +14,11 @@
images:
tags:
mariadb: docker.io/mariadb:10.1.23
prometheus_create_mysql_user: docker.io/mariadb:10.1.23
# NOTE: if you update from 10.2.13 please look at
# https://review.openstack.org/#/q/Ifd09d7effe7d382074ca9e6678df36bdd4bce0af
# and check whether it's still needed
mariadb: docker.io/mariadb:10.2.13
prometheus_create_mysql_user: docker.io/mariadb:10.2.13
prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0
prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0