1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-18379: Unification of check for IPv6

Browse Source 
Currently, the three-node mtr suite for Galera (galera_3nodes)
uses a separate IPv6 availability check using the "have_ipv6.inc"
file. This check duplicates a more accurate check at suite.pm
level, which can be used by including the file "check_ipv6.inc".

This patch removes this discrepancy between suites. In addition,
one of the files in the galera_3nodes suite does not contain the
option "--bind-address=::" which is needed for the test to work
correctly with IPv6 (at least on some systems), since without
it the server will not wait for connections on the IPv6 interface.

https://jira.mariadb.org/browse/MDEV-18379
This commit is contained in:
Julius Goryavsky 2019-01-25 12:29:50 +01:00
parent 45c47a04bd
commit a22dc6268b
7 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/suite/galera_3nodes/include/have_ipv6.inc
View File

@ -1,15 +0,0 @@
# Check if ipv6 is available.
#
--disable_query_log
--disable_result_log
connect (checkcon123456789,::1,root,,test);
if($mysql_errno)
{
skip No IPv6 support;
}
connection default;
disconnect checkcon123456789;
--enable_result_log
--enable_query_log
# end check

3
mysql-test/suite/galera_3nodes/r/GAL-501.result
View File

@ -4,9 +4,12 @@ VARIABLE_VALUE LIKE '%[::1]%'
SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
VARIABLE_VALUE = 3
1
connection node_2;
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
connection node_1;
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1);
connection node_2;
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
SELECT COUNT(*) = 1 FROM t1;
COUNT(*) = 1

1
mysql-test/suite/galera_3nodes/t/GAL-501.opt Normal file
View File

@ -0,0 +1 @@
--bind-address=::

2
mysql-test/suite/galera_3nodes/t/GAL-501.test
View File

@ -5,7 +5,7 @@
# ist.recv_addr=[::1]
--source include/galera_cluster.inc
--source include/have_ipv6.inc
--source include/check_ipv6.inc
# Confirm that initial handshake happened over ipv6

2
mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test
View File

@ -1,5 +1,5 @@
--source include/galera_cluster.inc
--source include/have_ipv6.inc
--source include/check_ipv6.inc
--source include/have_mariabackup.inc
# Confirm that initial handshake happened over ipv6

2
mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test
View File

@ -1,5 +1,5 @@
--source include/galera_cluster.inc
--source include/have_ipv6.inc
--source include/check_ipv6.inc
call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to'");
call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");

2
mysql-test/suite/galera_3nodes/t/galera_ipv6_rsync.test
View File

@ -1,5 +1,5 @@
--source include/galera_cluster.inc
--source include/have_ipv6.inc
--source include/check_ipv6.inc
# Confirm that initial handshake happened over ipv6