Commit 466ae1cf authored by Sergei Golubchik's avatar Sergei Golubchik

sporadic failures of galera.galera_sst_mariabackup

the test failed almost always in release (but not in debug) builds with

--- galera_sst_mariabackup.result
+++ galera_sst_mariabackup.reject
@@ -5,7 +5,7 @@
 connection node_1;
 select @@innodb_undo_tablespaces;
 @@innodb_undo_tablespaces
-0
+3
 connection node_2;
 select @@innodb_undo_tablespaces;
 @@innodb_undo_tablespaces

and

[Warning] InnoDB: Cannot change innodb_undo_tablespaces=0 because previous shutdown was not with innodb_fast_shutdown=0

because mariadbd *before this test* wasn't using innodb_fast_shutdown=0

Fix the bootstrap to use innodb_fast_shutdown=0 (and the bootstrap
creates a starting point for any test that uses a .cnf file)

followup for cac0fc97

also, remove redundant include/have_innodb.inc
parent f9807aad
...@@ -13,10 +13,8 @@ if (!$galera_cluster_size) ...@@ -13,10 +13,8 @@ if (!$galera_cluster_size)
} }
--source include/galera_init.inc --source include/galera_init.inc
--source include/have_innodb.inc
--source include/galera_wait_ready.inc --source include/galera_wait_ready.inc
--let $_galera_node= $galera_cluster_size --let $_galera_node= $galera_cluster_size
while ($_galera_node != 1) while ($_galera_node != 1)
......
# To be used in a test which requires wsrep plugin to be ACTIVE and enabled # To be used in a test which requires wsrep plugin to be ACTIVE and enabled
# (i.e. wsrep_on=ON). It includes have_wsrep.inc. # (i.e. wsrep_on=ON). It includes have_wsrep.inc.
--source include/have_innodb.inc
if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'wsrep_on' AND VARIABLE_VALUE='ON'`) if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'wsrep_on' AND VARIABLE_VALUE='ON'`)
{ {
--skip Test requires wsrep_on=ON --skip Test requires wsrep_on=ON
......
...@@ -3103,6 +3103,7 @@ sub mysql_install_db { ...@@ -3103,6 +3103,7 @@ sub mysql_install_db {
# starting from 10.0 bootstrap scripts require InnoDB # starting from 10.0 bootstrap scripts require InnoDB
mtr_add_arg($args, "--loose-innodb"); mtr_add_arg($args, "--loose-innodb");
mtr_add_arg($args, "--loose-innodb-log-file-size=10M"); mtr_add_arg($args, "--loose-innodb-log-file-size=10M");
mtr_add_arg($args, "--loose-innodb-fast-shutdown=0");
mtr_add_arg($args, "--disable-sync-frm"); mtr_add_arg($args, "--disable-sync-frm");
mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/"); mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/");
mtr_add_arg($args, "--core-file"); mtr_add_arg($args, "--core-file");
......
--source include/big_test.inc --source include/big_test.inc
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_innodb.inc
--source include/have_mariabackup.inc --source include/have_mariabackup.inc
# Save original auto_increment_offset values. # Save original auto_increment_offset values.
......
--source include/have_innodb.inc
--source include/have_wsrep_enabled.inc --source include/have_wsrep_enabled.inc
--source include/have_binlog_format_row.inc --source include/have_binlog_format_row.inc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment