From e4a3a11dcce7e800cb89ac681ef21e7ad6ba1d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Tue, 5 Nov 2024 12:09:30 +0200 Subject: [PATCH] MDEV-35344 : Galera test failure on galera_sync_wait_upto 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 --- mysql-test/suite/galera/t/galera_sync_wait_upto.test | 1 + .../suite/galera/t/galera_var_ignore_apply_errors.test | 1 + sql/wsrep_mysqld.cc | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/galera/t/galera_sync_wait_upto.test b/mysql-test/suite/galera/t/galera_sync_wait_upto.test index 8465ddebfeb..dce856c10f2 100644 --- a/mysql-test/suite/galera/t/galera_sync_wait_upto.test +++ b/mysql-test/suite/galera/t/galera_sync_wait_upto.test @@ -3,6 +3,7 @@ # --source include/galera_cluster.inc +--source include/have_debug.inc --source include/have_debug_sync.inc CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; diff --git a/mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test b/mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test index e5c13dddd29..02dd9fa8416 100644 --- a/mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test +++ b/mysql-test/suite/galera/t/galera_var_ignore_apply_errors.test @@ -2,6 +2,7 @@ # Test option wsrep_ignore_apply_errors # +--source include/have_perfschema.inc --source include/galera_cluster.inc --source include/force_restart.inc diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index fac87cdfa1c..6fd6250ca24 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -827,9 +827,8 @@ void wsrep_init_globals() else { if (wsrep_gtid_mode && wsrep_gtid_server.server_id != global_system_variables.server_id) - { - WSREP_WARN("Ignoring server id for non bootstrap node."); - } + WSREP_INFO("Ignoring server id %ld for non bootstrap node, using %ld.", + global_system_variables.server_id, wsrep_gtid_server.server_id); } wsrep_init_schema(); if (WSREP_ON)