hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate MariaDB installation and Galera configuration

Browse Source 
MDBCI now supports separate Galera server .cnf configuring.
Changing MDBCI config template in order to use this MDBCI
capability. It allows to use any MariaDB product in the
backend (Community or Enterprise, production, staging or CI)
This commit is contained in:
Timofey Turenko
2020-11-18 19:12:24 +02:00
parent 4300f1d80e
commit 41caccbf4b
5 changed files with 49 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system-test/create_user.sh
View File

@ -7,6 +7,8 @@
mysql --force $1 <<EOF >& /dev/null
CREATE DATABASE IF NOT EXISTS test;
DROP USER IF EXISTS '$node_user'@'%';
CREATE USER '$node_user'@'%' IDENTIFIED BY '$node_password';
GRANT ALL PRIVILEGES ON *.* TO '$node_user'@'%' $require_ssl WITH GRANT OPTION;

2
system-test/create_user_galera.sh
View File

@ -13,6 +13,8 @@ done
mysql --force <<EOF
CREATE DATABASE IF NOT EXISTS test;
DELETE FROM mysql.user WHERE user = '';
DROP USER IF EXISTS '$galera_user'@'%';

1
system-test/maxtest/src/mariadb_nodes.cc
View File

@ -468,6 +468,7 @@ int Galera_nodes::start_galera()
ssh_node(i, "echo [mysqld] > cluster_address.cnf", true);
ssh_node_f(i, true, "echo wsrep_cluster_address=gcomm://%s >> cluster_address.cnf", gcomm.c_str());
ssh_node(i, "cp cluster_address.cnf /etc/my.cnf.d/", true);
ssh_node(i, "cp cluster_address.cnf /etc/mysql/my.cnf.d/", true);
ssh_node(i, "rm -rf /var/lib/mysql/*", true);
ssh_node(i, "mysql_install_db --user=mysql", true);

60
system-test/mdbci/templates/default.json.template
View File

@ -265,12 +265,17 @@
"labels" : [
"GALERA_BACKEND"
],
"product" : {
"name": "galera",
"version": "${galera_version}",
"cnf_template" : "galera_server1.cnf",
"cnf_template_path": "${cnf_path}"
"products" : [
{
"name": "${product}",
"version": "${version}"
},
{
"name": "galera_config",
"cnf_template" : "galera_server1.cnf"
}
],
"cnf_template_path": "${cnf_path}"
},
"galera_001" :
@ -282,12 +287,17 @@
"labels" : [
"GALERA_BACKEND"
],
"product" : {
"name": "galera",
"version": "${galera_version}",
"cnf_template" : "galera_server2.cnf",
"cnf_template_path": "${cnf_path}"
"products" : [
{
"name": "${product}",
"version": "${version}"
},
{
"name": "galera_config",
"cnf_template" : "galera_server2.cnf"
}
],
"cnf_template_path": "${cnf_path}"
},
"galera_002" :
@ -299,12 +309,17 @@
"labels" : [
"GALERA_BACKEND"
],
"product" : {
"name": "galera",
"version": "${galera_version}",
"cnf_template" : "galera_server3.cnf",
"cnf_template_path": "${cnf_path}"
"products" : [
{
"name": "${product}",
"version": "${version}"
},
{
"name": "galera_config",
"cnf_template" : "galera_server3.cnf"
}
],
"cnf_template_path": "${cnf_path}"
},
"galera_003" :
@ -316,12 +331,17 @@
"labels" : [
"GALERA_BACKEND"
],
"product" : {
"name": "galera",
"version": "${galera_version}",
"cnf_template" : "galera_server4.cnf",
"cnf_template_path": "${cnf_path}"
"products" : [
{
"name": "${product}",
"version": "${version}"
},
{
"name": "galera_config",
"cnf_template" : "galera_server4.cnf"
}
],
"cnf_template_path": "${cnf_path}"
},
"maxscale_000" :

68
system-test/mdbci/templates/performance.json.template
View File

@ -1,68 +0,0 @@
{
###nodes###
"galera_000" :
{
"hostname" : "galera000",
"box" : "centos_7_libvirt",
"memory_size" : "2048",
"product" : {
"name": "galera",
"version": "###galera_version###",
"cnf_template" : "galera_server1.cnf",
"cnf_template_path": "~/build-scripts/test-setup-scripts/cnf"
}
},
"galera_001" :
{
"hostname" : "galera001",
"box" : "centos_7_libvirt",
"memory_size" : "2048",
"product" : {
"name": "galera",
"version": "###galera_version###",
"cnf_template" : "galera_server2.cnf",
"cnf_template_path": "~/build-scripts/test-setup-scripts/cnf"
}
},
"galera_002" :
{
"hostname" : "galera002",
"box" : "centos_7_libvirt",
"memory_size" : "2048",
"product" : {
"name": "galera",
"version": "###galera_version###",
"cnf_template" : "galera_server3.cnf",
"cnf_template_path": "~/build-scripts/test-setup-scripts/cnf"
}
},
"galera_003" :
{
"hostname" : "galera003",
"box" : "centos_7_libvirt",
"memory_size" : "2048",
"product" : {
"name": "galera",
"version": "###galera_version###",
"cnf_template" : "galera_server4.cnf",
"cnf_template_path": "~/build-scripts/test-setup-scripts/cnf"
}
},
"maxscale" :
{
"hostname" : "maxscale",
"box" : "###box###",
"memory_size" : "2048",
"product" : {
"name" : "maxscale_ci",
"version" : "${target}"
}
}
}