database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-30172: Tolerate CR_SSL_CONNECTION_ERROR in Galera tests

Browse Source 
We should treat CR_SERVER_LOST (2013) and CR_SSL_CONNECTION_ERROR (2026)
interchangeably.
This commit is contained in:
Marko Mäkelä
2023-12-21 12:52:31 +02:00
parent 138cd311b4
commit ea0937d42a
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/suite/galera/r/galera_gcache_recover_manytrx.result
View File

@@ -100,19 +100,19 @@ Killing server ...
connection node_1; connection node_1;
Killing server ... Killing server ...
connection node_1_insert_simple; connection node_1_insert_simple;
ERROR HY000: Lost connection to server during query Got one of the listed errors
connection node_1_insert_multi; connection node_1_insert_multi;
ERROR HY000: Lost connection to server during query Got one of the listed errors
connection node_1_insert_transaction; connection node_1_insert_transaction;
ERROR HY000: Lost connection to server during query Got one of the listed errors
connection node_1_update_simple; connection node_1_update_simple;
ERROR HY000: Lost connection to server during query Got one of the listed errors
connection node_1_insert_1k; connection node_1_insert_1k;
ERROR HY000: Lost connection to server during query Got one of the listed errors
connection node_1_insert_1m; connection node_1_insert_1m;
ERROR HY000: Lost connection to server during query Got one of the listed errors
connection node_1_insert_10m; connection node_1_insert_10m;
ERROR HY000: Lost connection to server during query Got one of the listed errors
connection node_1; connection node_1;
Performing --wsrep-recover ... Performing --wsrep-recover ...
Using --wsrep-start-position when starting mysqld ... Using --wsrep-start-position when starting mysqld ...

14
mysql-test/suite/galera/t/galera_gcache_recover_manytrx.test
View File

@@ -142,31 +142,31 @@ SET SESSION wsrep_sync_wait = 0;
--source include/kill_galera.inc --source include/kill_galera.inc
--connection node_1_insert_simple --connection node_1_insert_simple
--error 2013 --error 2013, 2026
--reap --reap
--connection node_1_insert_multi --connection node_1_insert_multi
--error 2013 --error 2013, 2026
--reap --reap
--connection node_1_insert_transaction --connection node_1_insert_transaction
--error 2013 --error 2013, 2026
--reap --reap
--connection node_1_update_simple --connection node_1_update_simple
--error 2013 --error 2013, 2026
--reap --reap
--connection node_1_insert_1k --connection node_1_insert_1k
--error 2013 --error 2013, 2026
--reap --reap
--connection node_1_insert_1m --connection node_1_insert_1m
--error 2013 --error 2013, 2026
--reap --reap
--connection node_1_insert_10m --connection node_1_insert_10m
--error 2013 --error 2013, 2026
--reap --reap
--connection node_1 --connection node_1

2
mysql-test/suite/galera_3nodes_sr/r/GCF-832.result
View File

@@ -12,7 +12,7 @@ SET SESSION wsrep_trx_fragment_size=1;
START TRANSACTION; START TRANSACTION;
INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary'); INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary');
COMMIT; COMMIT;
ERROR HY000: Lost connection to server during query Got one of the listed errors
# restart # restart
connection node_1; connection node_1;
SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;

2
mysql-test/suite/galera_3nodes_sr/t/GCF-832.test
View File

@@ -26,7 +26,7 @@ SET SESSION wsrep_trx_fragment_size=1;
START TRANSACTION; START TRANSACTION;
INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary'); INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary');
--error 2013 --error 2013,2026
COMMIT; COMMIT;
--source include/start_mysqld.inc --source include/start_mysqld.inc

2
mysql-test/suite/galera_sr/r/MDEV-27615.result
View File

@@ -15,7 +15,7 @@ SET DEBUG_SYNC='now WAIT_FOR before_fragment';
SET GLOBAL wsrep_cluster_address = ''; SET GLOBAL wsrep_cluster_address = '';
SET DEBUG_SYNC = 'now SIGNAL continue'; SET DEBUG_SYNC = 'now SIGNAL continue';
connection node_2; connection node_2;
ERROR HY000: Lost connection to server during query Got one of the listed errors
connection node_2a; connection node_2a;
SELECT * FROM mysql.wsrep_streaming_log; SELECT * FROM mysql.wsrep_streaming_log;
node_uuid trx_id seqno flags frag node_uuid trx_id seqno flags frag

3
mysql-test/suite/galera_sr/t/MDEV-27615.test
View File

@@ -43,7 +43,8 @@ SET DEBUG_SYNC = 'now SIGNAL continue';
# Disconnect causes connection to node_2 to be closed # Disconnect causes connection to node_2 to be closed
# #
--connection node_2 --connection node_2
--error 2013 # CR_SERVER_LOST # CR_SERVER_LOST, CR_SSL_CONNECTION_ERROR
--error 2013,2026
--reap --reap