From 316e9385993e05174f090a3de27acf19cdad8475 Mon Sep 17 00:00:00 2001 From: Vlad Lesin Date: Tue, 12 May 2020 13:57:09 +0300 Subject: MDEV-22398: mariabackup.innodb_xa_rollback fails on repeat Flush LSN to system tablespace on innodb shutdown if XA is rolled back by mariabackup. --- storage/innobase/srv/srv0start.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc index 41a1d42f649..e8a6a10d39d 100644 --- a/storage/innobase/srv/srv0start.cc +++ b/storage/innobase/srv/srv0start.cc @@ -2777,11 +2777,15 @@ innodb_shutdown() ut_ad(!srv_undo_sources); switch (srv_operation) { + case SRV_OPERATION_RESTORE_ROLLBACK_XA: + if (dberr_t err = fil_write_flushed_lsn(log_sys->lsn)) + ib::error() << "Writing flushed lsn " << log_sys->lsn + << " failed; error=" << err; + /* fall through */ case SRV_OPERATION_BACKUP: case SRV_OPERATION_RESTORE: case SRV_OPERATION_RESTORE_DELTA: case SRV_OPERATION_RESTORE_EXPORT: - case SRV_OPERATION_RESTORE_ROLLBACK_XA: fil_close_all_files(); break; case SRV_OPERATION_NORMAL: -- cgit v1.2.1