MDEV-35344 : Galera test failure on galera_sync_wait_upto

janlindstrom · sysprg · commit e4a3a11dcce7 · 2024-11-06T04:59:10.000+01:00
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 &lt;julius.goryavsky@mariadb.com&gt;
diff --git 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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#`
`4`	`4`
`5`	`5`	`--source include/galera_cluster.inc`
	`6`	`+--source include/have_debug.inc`
`6`	`7`	`--source include/have_debug_sync.inc`
`7`	`8`
`8`	`9`	`CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`# Test option wsrep_ignore_apply_errors`
`3`	`3`	`#`
`4`	`4`
	`5`	`+--source include/have_perfschema.inc`
`5`	`6`	`--source include/galera_cluster.inc`
`6`	`7`	`--source include/force_restart.inc`
`7`	`8`
Original file line number	Diff line number	Diff line change
`@@ -827,9 +827,8 @@ void wsrep_init_globals()`
`827`	`827`	`else`
`828`	`828`	`{`
`829`	`829`	`if (wsrep_gtid_mode && wsrep_gtid_server.server_id != global_system_variables.server_id)`
`830`		`- {`
`831`		`- WSREP_WARN("Ignoring server id for non bootstrap node.");`
`832`		`- }`
	`830`	`+ WSREP_INFO("Ignoring server id %ld for non bootstrap node, using %ld.",`
	`831`	`+ global_system_variables.server_id, wsrep_gtid_server.server_id);`
`833`	`832`	`}`
`834`	`833`	`wsrep_init_schema();`
`835`	`834`	`if (WSREP_ON)`