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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä 2020-01-27 15:49:54 +02:00
commit 39da32dac7
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
13 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BUILD/install_test_build_deps.sh
View File

@ -24,6 +24,7 @@ then
mariadb-test python python-pip cmake \
libpam0g-dev libsqlite3-dev
sudo apt-get install -y --force-yes openjdk-8-jdk
sudo apt-get install -y --force-yes php-mysql
if [ $? != 0 ]
then
sudo apt-get install -y --force-yes openjdk-7-jdk
@ -54,6 +55,7 @@ EOL
cmake pam-devel openssl-devel python-devel libjansson-devel \
sqlite3 sqlite3-devel libcurl-devel
sudo zypper -n install java-1_8_0-openjdk
sudo zypper -n install php-mysql
else
# YUM!
cat >mariadb.repo <<'EOL'
@ -75,6 +77,7 @@ EOL
sudo yum install -y --nogpgcheck java-1.8.0-openjdk
sudo yum install -y --nogpgcheck centos-release-scl
sudo yum install -y --nogpgcheck devtoolset-7-gcc*
sudo yum install -y --nogpgcheck php-mysql
echo "please run 'scl enable devtoolset-7 bash' to enable new gcc!!"
fi
sudo pip install --upgrade pip

4
maxscale-system-test/CMakeLists.txt
View File

@ -215,7 +215,7 @@ add_test_executable(mxs2355_wrong_auth.cpp mxs2355_wrong_auth maxctrl LABELS REP
############################################
# Configures 'keepalived' on two Maxscale machines and tried failover
add_test_executable(keepalived_masterdown.cpp keepalived_masterdown keepalived_masterdown LABELS REPL_BACKEND TWO_MAXSCALES)
#add_test_executable(keepalived_masterdown.cpp keepalived_masterdown keepalived_masterdown LABELS REPL_BACKEND TWO_MAXSCALES)
# MySQL Monitor with Multi-master configurations
add_test_executable(mysqlmon_multimaster.cpp mysqlmon_multimaster mysqlmon_multimaster LABELS mysqlmon REPL_BACKEND BREAKS_REPL)
@ -864,7 +864,7 @@ add_test_executable(kerberos_setup.cpp kerberos_setup kerberos LABELS HEAVY gssa
add_test_derived(kerberos_setup_ssl kerberos_setup kerberos_ssl LABELS HEAVY gssapi BACKEND_SSL REPL_BACKEND)
# Configures 'keepalived' on two Maxscale machines and tried failover
add_test_executable(keepalived.cpp keepalived keepalived LABELS REPL_BACKEND TWO_MAXSCALES)
#add_test_executable(keepalived.cpp keepalived keepalived LABELS REPL_BACKEND TWO_MAXSCALES)
# a tool to delete RDS Aurora cluster
add_test_executable_notest(delete_rds.cpp delete_rds replication LABELS EXTERN_BACKEND)

1
maxscale-system-test/cache_basic.sh
View File

@ -44,6 +44,7 @@ target=${maxscale_000_whoami}@${maxscale_000_network}:/home/${maxscale_000_whoam
if [ ${maxscale_000_network} != "127.0.0.1" ] ; then
scp -i ${maxscale_000_keyfile} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $source $target
ssh -i $maxscale_000_keyfile -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${maxscale_000_whoami}@${maxscale_000_network} chmod a+r /home/${maxscale_000_whoami}/cache_rules.json
else
cp $source /home/${maxscale_000_whoami}/cache_rules.json
fi

4
maxscale-system-test/fw_copy_rules.cpp
View File

@ -21,5 +21,9 @@ void copy_rules(TestConnections* Test, const char* rules_name, const char* rules
Test->set_timeout(30);
Test->maxscales->copy_to_node_legacy(src.str().c_str(), dest.str().c_str(), 0);
Test->maxscales->ssh_node_f(0,
true,
"chmod a+r %s",
dest.str().c_str());
Test->stop_timeout();
}

1
maxscale-system-test/masking_auto_firewall.cpp
View File

@ -177,6 +177,7 @@ int main(int argc, char* argv[])
if (test.maxscales->copy_to_node(0, from.c_str(), to.c_str()) == 0)
{
test.maxscales->ssh_node(0, (std::string("chmod a+r ") + to).c_str(), true);
if (test.maxscales->start() == 0)
{
sleep(2);

1
maxscale-system-test/masking_mysqltest_driver.sh
View File

@ -7,6 +7,7 @@ target=${maxscale_000_whoami}@${maxscale_000_network}:/home/${maxscale_000_whoam
if [ ${maxscale_000_network} != "127.0.0.1" ] ; then
scp -i $maxscale_000_keyfile -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $source $target
ssh -i $maxscale_000_keyfile -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${maxscale_000_whoami}@${maxscale_000_network} chmod a+r /home/${maxscale_000_whoami}/masking_rules.json
else
cp $source /home/${maxscale_000_whoami}/masking_rules.json
fi

2
maxscale-system-test/mxs1110_16mb.cpp
View File

@ -27,6 +27,8 @@ int main(int argc, char* argv[])
Test->maxscales->copy_to_node_legacy(cache_rules.c_str(), "~/", 0);
Test->maxscales->ssh_node(0, "chmod a+rw *.json", true);
copy_rules(Test, "rules2", fw_rules.c_str());
Test->maxscales->start_maxscale(0);

1
maxscale-system-test/mxs1719.cpp
View File

@ -82,6 +82,7 @@ int main(int argc, char* argv[])
if (test.maxscales->copy_to_node(0, src.c_str(), dst.c_str()) == 0)
{
test.maxscales->ssh_node(0, (std::string("chmod a+r ") + dst).c_str(), true);
if (test.maxscales->start() == 0)
{
sleep(10);

3
maxscale-system-test/mxs1731_old_persisted_config.cpp
View File

@ -30,6 +30,9 @@ int main(int argc, char** argv)
"chown maxscale:maxscale /var/lib/maxscale/maxscale.cnf.d/;"
"cp %s /var/lib/maxscale/maxscale.cnf.d/RW-Split-Router.cnf",
filename);
test.maxscales->ssh_node_f(0,
true,
"chmod a+r /var/lib/maxscale/maxscale.cnf.d/RW-Split-Router.cnf");
test.maxscales->restart();
test.check_maxscale_alive();

2
maxscale-system-test/mxs1980_blr_galera_server_ids.cpp
View File

@ -214,7 +214,7 @@ void insert(TestConnections& test, MYSQL* pMaster)
void select(TestConnections& test, MYSQL* pSlave)
{
int attempts = 5;
int attempts = 15;
my_ulonglong nRows = 0;
unsigned long long nResult_sets;

1
maxscale-system-test/mxs2057_systemd_watchdog.cpp
View File

@ -81,6 +81,7 @@ int main(int argc, char* argv[])
std::string to = std::string(test.maxscales->access_homedir[0]) + lua_file;
test.maxscales->copy_to_node(0, from.c_str(), to.c_str());
test.maxscales->ssh_node(0, (std::string("chmod a+r ") + to).c_str(), true);
test.maxscales->start();
sleep(2);
test.maxscales->wait_for_monitor();

1
maxscale-system-test/mxs722.cpp
View File

@ -23,6 +23,7 @@ int main(int argc, char* argv[])
/** Copy original config so we can easily reset the testing environment */
test->maxscales->ssh_node_f(0, true, "cp /etc/maxscale.cnf /tmp/maxscale.cnf");
test->maxscales->ssh_node_f(0, true, "chmod a+rw /tmp/maxscale.cnf");
/** Get a baseline result with a good configuration */
int baseline = test->maxscales->ssh_node_f(0, true, "maxscale -c --user=maxscale -f /tmp/maxscale.cnf");

6
maxscale-system-test/script.cpp
View File

@ -41,9 +41,9 @@ void test_script_monitor(TestConnections* Test, Mariadb_nodes* nodes, char* expe
Test->set_timeout(200);
Test->maxscales->ssh_node_f(0,
true,
"cd %s;"
"truncate -s 0 script_output;"
"chown maxscale:maxscale script_output",
"cd %s; truncate -s 0 script_output; \
chown maxscale:maxscale script_output; \
chmod a+rw script_output",
Test->maxscales->access_homedir[0]);
sleep(10);