mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-35265 wsrep.wsrep-recover, wsrep.wsrep-recover-v25 fail on assertion

Browse source 
The tests fail on assertion

    ut_ad(!wsrep_is_wsrep_xid(&trx->xid));

in `innobase_recover_rollback_by_xid()`.

The fix is to avoid async rollback for prepared transactions
when wsrep is ON or wsrep recovery is in progress. The rationale
is that the rollback of prepared transactions must complete
before the node starts applying write sets after SST, or in
case of wsrep recovery, the recovery must complete before the
process exists.

Change the assertion into stronger one

    ut_ad(!(WSREP_ON || wsrep_recovery));

to catch if the async rollback codepath is taken when wsrep is
enabled.
This commit is contained in:
Teemu Ollakka 2024-10-29 12:15:53 +02:00
parent 4b6922a315
commit 47dd617c7f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/handler.cc
View file

@ -2684,7 +2684,8 @@ static void xarecover_do_commit_or_rollback(handlerton *hton,
if (xarecover_decide_to_commit(member, ptr_commit_max))
rc= hton->commit_by_xid(hton, &x);
else if (hton->recover_rollback_by_xid)
else if (hton->recover_rollback_by_xid &&
IF_WSREP(!(WSREP_ON || wsrep_recovery), true))
rc= hton->recover_rollback_by_xid(&x);
else
rc= hton->rollback_by_xid(hton, &x);

3
storage/innobase/handler/ha_innodb.cc
View file

@ -17211,7 +17211,8 @@ int innobase_recover_rollback_by_xid(const XID *xid)
ut_ad(trx->state == TRX_STATE_PREPARED);
#ifdef WITH_WSREP
ut_ad(!wsrep_is_wsrep_xid(&trx->xid));
// prepared transactions must not be rolled back asynchronously when wsrep is on
ut_ad(!(WSREP_ON || wsrep_recovery));
#endif
if (trx->rsegs.m_redo.undo)