Skip to content

Commit

Permalink
MDEV-33928 : Assertion failure on wsrep_thd_is_aborting
Browse files Browse the repository at this point in the history
Problem was assertion assuming we always hold
THD::LOCK_thd_data mutex that is not true.
In most cases this is true but function is
also used from InnoDB lock manager and
there we can't take THD::LOCK_thd_data to
obey mutex ordering. Removed assertion as
wsrep transaction state can't change even
that case.

Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
  • Loading branch information
janlindstrom authored and sysprg committed Apr 22, 2024
1 parent 4aeba25 commit a2fee2d
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions sql/service_wsrep.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2018-2023 Codership Oy <info@codership.com>
/* Copyright 2018-2024 Codership Oy <info@codership.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -283,10 +283,28 @@ extern "C" my_bool wsrep_thd_order_before(const THD *left, const THD *right)
return FALSE;
}

/** Check if wsrep transaction is aborting state.
Calling function should make sure that wsrep transaction state
can't change during this function.
This function is called from
wsrep_abort_thd where we hold THD::LOCK_thd_data
wsrep_handle_mdl_conflict we hold THD::LOCK_thd_data
wsrep_assert_no_bf_bf_wait we hold lock_sys.latch
innobase_kill_query we hold THD::LOCK_thd_data (THD::awake_no_mutex)
@param thd thread handle
@return true if wsrep transaction is aborting
@return false if not
*/
extern "C" my_bool wsrep_thd_is_aborting(const MYSQL_THD thd)
{
const wsrep::client_state& cs(thd->wsrep_cs());
const enum wsrep::transaction::state tx_state(cs.transaction().state());

switch (tx_state)
{
case wsrep::transaction::s_must_abort:
Expand All @@ -296,8 +314,10 @@ extern "C" my_bool wsrep_thd_is_aborting(const MYSQL_THD thd)
case wsrep::transaction::s_aborted:
return true;
default:
return false;
break;
}

return false;
}

static inline enum wsrep::key::type
Expand Down

0 comments on commit a2fee2d

Please sign in to comment.