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

galera crashes in debug builds

Browse Source 
after 6b685ea7b077 one can no longer violate the locking protocol
by invoking thd_get_ha_data() on some other thread without
protecting that with a mutex
This commit is contained in:
Sergei Golubchik 2022-10-06 16:52:16 +02:00
parent 5e7bafe01c
commit eae037c286
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
storage/innobase/handler/ha_innodb.cc
View File

@ -18727,7 +18727,10 @@ wsrep_abort_transaction(
ut_ad(bf_thd); ut_ad(bf_thd);
ut_ad(victim_thd); ut_ad(victim_thd);
wsrep_thd_kill_LOCK(victim_thd);
wsrep_thd_LOCK(victim_thd);
trx_t* victim_trx= thd_to_trx(victim_thd); trx_t* victim_trx= thd_to_trx(victim_thd);
wsrep_thd_UNLOCK(victim_thd);
WSREP_DEBUG("abort transaction: BF: %s victim: %s victim conf: %s", WSREP_DEBUG("abort transaction: BF: %s victim: %s victim conf: %s",
wsrep_thd_query(bf_thd), wsrep_thd_query(bf_thd),
@ -18737,7 +18740,6 @@ wsrep_abort_transaction(
if (victim_trx) { if (victim_trx) {
victim_trx->lock.set_wsrep_victim(); victim_trx->lock.set_wsrep_victim();
wsrep_thd_kill_LOCK(victim_thd);
wsrep_thd_LOCK(victim_thd); wsrep_thd_LOCK(victim_thd);
bool aborting= !wsrep_thd_set_wsrep_aborter(bf_thd, victim_thd); bool aborting= !wsrep_thd_set_wsrep_aborter(bf_thd, victim_thd);
wsrep_thd_UNLOCK(victim_thd); wsrep_thd_UNLOCK(victim_thd);
@ -18754,8 +18756,6 @@ wsrep_abort_transaction(
};); };);
wsrep_thd_bf_abort(bf_thd, victim_thd, signal); wsrep_thd_bf_abort(bf_thd, victim_thd, signal);
} }
wsrep_thd_kill_UNLOCK(victim_thd);
DBUG_VOID_RETURN;
} else { } else {
DBUG_EXECUTE_IF("sync.before_wsrep_thd_abort", DBUG_EXECUTE_IF("sync.before_wsrep_thd_abort",
{ {
@ -18766,11 +18766,10 @@ wsrep_abort_transaction(
DBUG_ASSERT(!debug_sync_set_action(bf_thd, DBUG_ASSERT(!debug_sync_set_action(bf_thd,
STRING_WITH_LEN(act))); STRING_WITH_LEN(act)));
};); };);
wsrep_thd_kill_LOCK(victim_thd);
wsrep_thd_bf_abort(bf_thd, victim_thd, signal); wsrep_thd_bf_abort(bf_thd, victim_thd, signal);
wsrep_thd_kill_UNLOCK(victim_thd);
} }
wsrep_thd_kill_UNLOCK(victim_thd);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }