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

MDEV-25410 Assertion `state_ == s_exec' failed - mysqld got signal 6

Browse Source 
Victim threads which are in currently in process of aborting or already
aborted should be skipped for another kill process.

Reviewed-by: Jan Lindström <jan.lindstrom@mariadb.com>
This commit is contained in:
mkaruza 2021-07-26 09:37:38 +02:00 committed by Jan Lindström
parent 386ac12a48
commit 093227c05e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/wsrep_thd.cc
View File

@ -349,6 +349,15 @@ bool wsrep_bf_abort(const THD* bf_thd, THD* victim_thd)
if (WSREP(victim_thd) && !victim_thd->wsrep_trx().active()) if (WSREP(victim_thd) && !victim_thd->wsrep_trx().active())
{ {
WSREP_DEBUG("wsrep_bf_abort, BF abort for non active transaction"); WSREP_DEBUG("wsrep_bf_abort, BF abort for non active transaction");
switch (victim_thd->wsrep_trx().state())
{
case wsrep::transaction::s_aborting: /* fall through */
case wsrep::transaction::s_aborted:
WSREP_DEBUG("victim thd is already aborted or in aborting state.");
return false;
default:
break;
}
wsrep_start_transaction(victim_thd, victim_thd->wsrep_next_trx_id()); wsrep_start_transaction(victim_thd, victim_thd->wsrep_next_trx_id());
} }