mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-32778 : galera_ssl_reload failed with warning message

Browse source 
Fixed used configuration and added suppression for warning
message. Test case changes only.

Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
This commit is contained in:
Jan Lindström 2024-07-31 14:45:32 +03:00 committed by Julius Goryavsky
parent 0ba6068a82
commit cb80ef93a9
4 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/galera_3nodes/disabled.def
View file

@ -11,7 +11,6 @@
##############################################################################
galera_2_cluster : MDEV-32631 galera_2_cluster: before_rollback(): Assertion `0' failed
galera_ssl_reload : MDEV-32778 galera_ssl_reload failed with warning message
galera_pc_bootstrap : temporarily disabled at the request of Codership
galera_ipv6_mariabackup_section : temporarily disabled at the request of Codership
GCF-354 : MDEV-25614 Galera test failure on GCF-354

6
mysql-test/suite/galera_3nodes/r/galera_ssl_reload.result
View file

@ -14,3 +14,9 @@ connection node_3;
# restart: with restart_parameters
connection node_2;
FLUSH SSL;
connection node_3;
call mtr.add_suppression("WSREP: Handshake failed: unexpected eof while reading");
connection node_2;
call mtr.add_suppression("WSREP: Handshake failed: unexpected eof while reading");
connection node_1;
call mtr.add_suppression("WSREP: Handshake failed: unexpected eof while reading");

10
mysql-test/suite/galera_3nodes/t/galera_ssl_reload.cnf
View file

@ -1,10 +1,14 @@
!include ../galera_3nodes.cnf
[mysqld]
wsrep-debug=1
loose-galera-ssl-reload=1
[mysqld.1]
wsrep_provider_options='base_port=@mysqld.1.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.root.crt;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.crt;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.key'
wsrep_provider_options='base_port=@mysqld.1.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/client-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/client-key.pem'
[mysqld.2]
wsrep_provider_options='base_port=@mysqld.2.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.root.crt;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.crt;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.key'
wsrep_provider_options='base_port=@mysqld.2.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/client-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/client-key.pem'
[mysqld.3]
wsrep_provider_options='base_port=@mysqld.3.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.root.crt;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.crt;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera_certs/galera.1.key'
wsrep_provider_options='base_port=@mysqld.3.#galera_port;socket.ssl=yes;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/client-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/client-key.pem'

20
mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test
View file

@ -5,6 +5,7 @@
--source include/galera_cluster.inc
--source include/have_openssl.inc
--source include/have_ssl_communication.inc
--source include/force_restart.inc
--let $galera_version=26.4.8
source ../../wsrep/include/check_galera_version.inc;
@ -31,22 +32,22 @@ let $ssl_cert = $MYSQLTEST_VARDIR/tmp/ssl_cert.pem;
let $ssl_key = $MYSQLTEST_VARDIR/tmp/ssl_key.pem;
let $ssl_ca = $MYSQLTEST_VARDIR/tmp/ssl_ca.pem;
copy_file std_data/galera_certs/galera.root.crt $ssl_ca;
copy_file std_data/galera_certs/galera.1.crt $ssl_cert;
copy_file std_data/galera_certs/galera.1.key $ssl_key;
copy_file std_data/cacert.pem $ssl_ca;
copy_file std_data/client-cert.pem $ssl_cert;
copy_file std_data/client-key.pem $ssl_key;
--connection node_2
--source include/shutdown_mysqld.inc
--let $restart_noprint=1
--let $restart_parameters = --wsrep_cluster_address=gcomm://127.0.0.1:$NODE_GALERAPORT_1 --wsrep_provider_options=base_port=$NODE_GALERAPORT_2;socket.ssl=yes;socket.ssl_ca=$MYSQL_TEST_DIR/std_data/galera_certs/galera.root.crt;socket.ssl_cert=$MYSQLTEST_VARDIR/tmp/ssl_cert.pem;socket.ssl_key=$MYSQLTEST_VARDIR/tmp/ssl_key.pem
--let $restart_parameters = --wsrep_cluster_address=gcomm://127.0.0.1:$NODE_GALERAPORT_1 --wsrep_provider_options=base_port=$NODE_GALERAPORT_2;socket.ssl=yes;socket.ssl_ca=$MYSQL_TEST_DIR/std_data/cacert.pem;socket.ssl_cert=$MYSQLTEST_VARDIR/tmp/ssl_cert.pem;socket.ssl_key=$MYSQLTEST_VARDIR/tmp/ssl_key.pem
--source include/start_mysqld.inc
--source include/galera_wait_ready.inc
# Set certificate and key and reload by setting directly `wsrep_provider_options`
remove_file $ssl_cert;
remove_file $ssl_key;
copy_file std_data/galera_certs/galera.2.crt $ssl_cert;
copy_file std_data/galera_certs/galera.2.key $ssl_key;
copy_file std_data/client-cert.pem $ssl_cert;
copy_file std_data/client-key.pem $ssl_key;
SET GLOBAL wsrep_provider_options = 'socket.ssl_reload=1';
--connection node_3
@ -67,5 +68,12 @@ remove_file $ssl_ca;
remove_file $ssl_cert;
remove_file $ssl_key;
--connection node_3
call mtr.add_suppression("WSREP: Handshake failed: unexpected eof while reading");
--connection node_2
call mtr.add_suppression("WSREP: Handshake failed: unexpected eof while reading");
--connection node_1
call mtr.add_suppression("WSREP: Handshake failed: unexpected eof while reading");
# Restore original auto_increment_offset values.
--source ../galera/include/auto_increment_offset_restore.inc