openstack/openstack-helm
Code Issues Proposed changes

Merge "Simplify/lessen requirements for MariaDB"

Browse Source
This commit is contained in:
Jenkins 2017-05-24 01:47:44 +00:00 committed by Gerrit Code Review
commit 283e934091
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mariadb/templates/bin/_bootstrap-db.sh.tpl
View File

@ -31,7 +31,7 @@ mysqld_safe --defaults-file=/etc/my.cnf \
--wsrep_cluster_address='gcomm://' \ --wsrep_cluster_address='gcomm://' \
--bind-address='127.0.0.1' \ --bind-address='127.0.0.1' \
--wsrep_node_address="127.0.0.1:{{ .Values.network.port.wsrep }}" \ --wsrep_node_address="127.0.0.1:{{ .Values.network.port.wsrep }}" \
--wsrep_provider_options="gcache.size=512M; gmcast.listen_addr=tcp://127.0.0.1:{{ .Values.network.port.wsrep }}" & --wsrep_provider_options="gmcast.listen_addr=tcp://127.0.0.1:{{ .Values.network.port.wsrep }}" &
TIMEOUT=120 TIMEOUT=120
while [[ ! -f /var/lib/mysql/mariadb.pid ]]; do while [[ ! -f /var/lib/mysql/mariadb.pid ]]; do

2
mariadb/templates/bin/_seed.sh.tpl
View File

@ -91,6 +91,6 @@ mysqld_safe --defaults-file=/etc/my.cnf \
--wsrep_cluster_address='gcomm://' \ --wsrep_cluster_address='gcomm://' \
--bind-address="0.0.0.0" \ --bind-address="0.0.0.0" \
--wsrep_node_address="${POD_IP}:{{ .Values.network.port.wsrep }}" \ --wsrep_node_address="${POD_IP}:{{ .Values.network.port.wsrep }}" \
--wsrep_provider_options="gcache.size=512M; gmcast.listen_addr=tcp://${POD_IP}:{{ .Values.network.port.wsrep }}" & --wsrep_provider_options="gmcast.listen_addr=tcp://${POD_IP}:{{ .Values.network.port.wsrep }}" &
wait_for_cluster wait_for_cluster
exit 0 exit 0

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

@ -61,6 +61,6 @@ else
--console \ --console \
--bind-address="0.0.0.0" \ --bind-address="0.0.0.0" \
--wsrep_node_address="${POD_IP}:{{ .Values.network.port.wsrep }}" \ --wsrep_node_address="${POD_IP}:{{ .Values.network.port.wsrep }}" \
--wsrep_provider_options="gcache.size=512M; gmcast.listen_addr=tcp://${POD_IP}:{{ .Values.network.port.wsrep }}" \ --wsrep_provider_options="gmcast.listen_addr=tcp://${POD_IP}:{{ .Values.network.port.wsrep }}" \
$WSREP_OPTIONS $WSREP_OPTIONS
fi fi

2
mariadb/templates/etc/_tuning.cnf.tpl
View File

@ -43,7 +43,7 @@ table_definition_cache=1024
# Typical values are 50..75% of available RAM. # Typical values are 50..75% of available RAM.
# TODO(tomasz.paszkowski): This needs to by dynamic based on avaliable RAM. # TODO(tomasz.paszkowski): This needs to by dynamic based on avaliable RAM.
innodb_buffer_pool_size=1024M innodb_buffer_pool_size=1024M
innodb_log_file_size=200M innodb_log_file_size=128M
innodb_flush_method=O_DIRECT innodb_flush_method=O_DIRECT
innodb_flush_log_at_trx_commit=2 innodb_flush_log_at_trx_commit=2
innodb_old_blocks_time=1000 innodb_old_blocks_time=1000

2
mariadb/templates/etc/_wsrep.cnf.tpl
View File

@ -15,7 +15,7 @@
[mysqld] [mysqld]
wsrep_cluster_name="{{ .Values.database.cluster_name }}" wsrep_cluster_name="{{ .Values.database.cluster_name }}"
wsrep_provider=/usr/lib/galera/libgalera_smm.so wsrep_provider=/usr/lib/galera/libgalera_smm.so
wsrep_provider_options="gcache.size=512M" wsrep_provider_options="gcache.size=128M"
wsrep_slave_threads=12 wsrep_slave_threads=12
wsrep_sst_auth=root:{{ .Values.database.root_password }} wsrep_sst_auth=root:{{ .Values.database.root_password }}
wsrep_sst_method={{ .Values.database.wsrep_sst_method }} wsrep_sst_method={{ .Values.database.wsrep_sst_method }}