MDEV-33039 Galera test failure on mysql-wsrep-features#165

janlindstrom · sysprg · commit c5ac9836b3fb · 2024-03-27T01:25:22.000+01:00
We should not set debug sync point when holding a mutex
to avoid mutex ordering failure.

Signed-off-by: Julius Goryavsky &lt;julius.goryavsky@mariadb.com&gt;
diff --git a/sql/service_wsrep.cc b/sql/service_wsrep.cc
@@ -201,11 +201,11 @@ extern "C" void wsrep_handle_SR_rollback(THD *bf_thd,
 
   /* Note: do not store/reset globals before wsrep_bf_abort() call
      to avoid losing BF thd context. */
-  mysql_mutex_lock(&victim_thd->LOCK_thd_data);
   if (!(bf_thd && bf_thd != victim_thd))
   {
     DEBUG_SYNC(victim_thd, "wsrep_before_SR_rollback");
   }
+  mysql_mutex_lock(&victim_thd->LOCK_thd_data);
   if (bf_thd)
   {
     wsrep_bf_abort(bf_thd, victim_thd);

Original file line number	Diff line number	Diff line change
`@@ -201,11 +201,11 @@ extern "C" void wsrep_handle_SR_rollback(THD *bf_thd,`
`201`	`201`
`202`	`202`	`/* Note: do not store/reset globals before wsrep_bf_abort() call`
`203`	`203`	`to avoid losing BF thd context. */`
`204`		`- mysql_mutex_lock(&victim_thd->LOCK_thd_data);`
`205`	`204`	`if (!(bf_thd && bf_thd != victim_thd))`
`206`	`205`	`{`
`207`	`206`	`DEBUG_SYNC(victim_thd, "wsrep_before_SR_rollback");`
`208`	`207`	`}`
	`208`	`+ mysql_mutex_lock(&victim_thd->LOCK_thd_data);`
`209`	`209`	`if (bf_thd)`
`210`	`210`	`{`
`211`	`211`	`wsrep_bf_abort(bf_thd, victim_thd);`