Skip to content

Commit 6309728

Browse files
janlindstromsysprg
authored andcommitted
MDEV-29876 : Galera test failure on galera_sst_encrypted
AES block cipher mode CTR is available at the moment only from OpenSSL 1.0.1. Do not run this testcase using CTR combination if it is not available. Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
1 parent dfd2eb5 commit 6309728

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

mysql-test/suite/galera/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
galera_as_slave_ctas : MDEV-28378 timeout
1414
galera_pc_recovery : MDEV-25199 cluster fails to start up
15-
galera_sst_encrypted : MDEV-29876 Galera test failure on galera_sst_encrypted
1615
galera_var_node_address : MDEV-20485 Galera test failure
1716
galera_sequences : MDEV-32561 WSREP FSM failure: no such a transition REPLICATING -> COMMITTED
1817
galera_shutdown_nonprim : MDEV-32635 galera_shutdown_nonprim: mysql_shutdown failed

mysql-test/suite/galera/suite.pm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,17 @@ push @::global_suppressions,
7070
sub which($) { return `sh -c "command -v $_[0]"` }
7171

7272
sub skip_combinations {
73-
my %skip = ();
73+
my @combinations;
74+
7475
$skip{'include/have_mariabackup.inc'} = 'Need socket statistics utility'
7576
unless which("lsof") || which("sockstat") || which("ss");
7677
$skip{'include/have_stunnel.inc'} = "Need 'stunnel' utility"
7778
unless which("stunnel");
7879
$skip{'include/have_qpress.inc'} = "Need 'qpress' utility"
7980
unless which("qpress");
81+
$skip{'../encryption/include/have_file_key_management_plugin.combinations'} = [ 'ctr' ]
82+
unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
83+
and $1 ge "1.0.1";
8084
%skip;
8185
}
8286

0 commit comments

Comments
 (0)