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

MDEV-35344 : Galera test failure on galera_sync_wait_upto

Browse Source 
Ignoring configured server_id should not be a warning because
correct configuration is documented. Changed message to info
level with more detailed message what was configured and
what will be actually used.

Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
This commit is contained in:
Jan Lindström 2024-11-05 12:09:30 +02:00 committed by Julius Goryavsky
parent eb891b6a95
commit e4a3a11dcc
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/galera/t/galera_sync_wait_upto.test
View File

@ -3,6 +3,7 @@
# #
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_debug.inc
--source include/have_debug_sync.inc --source include/have_debug_sync.inc
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;

1
mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test
View File

@ -2,6 +2,7 @@
# Test option wsrep_ignore_apply_errors # Test option wsrep_ignore_apply_errors
# #
--source include/have_perfschema.inc
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/force_restart.inc --source include/force_restart.inc

5
sql/wsrep_mysqld.cc
View File

@ -827,9 +827,8 @@ void wsrep_init_globals()
else else
{ {
if (wsrep_gtid_mode && wsrep_gtid_server.server_id != global_system_variables.server_id) if (wsrep_gtid_mode && wsrep_gtid_server.server_id != global_system_variables.server_id)
{ WSREP_INFO("Ignoring server id %ld for non bootstrap node, using %ld.",
WSREP_WARN("Ignoring server id for non bootstrap node."); global_system_variables.server_id, wsrep_gtid_server.server_id);
}
} }
wsrep_init_schema(); wsrep_init_schema();
if (WSREP_ON) if (WSREP_ON)