database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-34705: Binlog-in-engine: Fix hang with event group of specific size

Browse Source 
If the event group fitted in the binlog cache without the GTID event but not
with, the code would attempt to spill part of the GTID event as out-of-band
data, which is not correct. In release builds this would hang the server as
the spilling would try to lock an already owned mutex.

Fix by checking if the GTID event fits, and spilling any non-GTID data as
oob if it does not.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2025-06-01 21:46:52 +02:00
parent 36b559fe7d
commit baec2064a1
6 changed files with 101 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/log_event_server.cc
View File

@@ -2973,6 +2973,18 @@ Gtid_log_event::peek(const uchar *event_start, size_t event_len,
}
uint32_t
Gtid_log_event::get_size() const noexcept
{
return get_gtid_event_size(flags2 & FL_GROUP_COMMIT_ID,
flags2 & (FL_PREPARED_XA | FL_COMPLETED_XA),
flags_extra > 0,
flags_extra & FL_EXTRA_MULTI_ENGINE_E1,
flags_extra & (FL_COMMIT_ALTER_E1 | FL_ROLLBACK_ALTER_E1),
xid.bqual_length, xid.gtrid_length);
}
bool
Gtid_log_event::write(Log_event_writer *writer)
{
@@ -3042,6 +3054,17 @@ Gtid_log_event::write(Log_event_writer *writer)
bzero(buf+write_len, GTID_HEADER_LEN-write_len);
write_len= GTID_HEADER_LEN;
}
/*
Whenever updating this function, make sure that Gtid_log_event::get_size()
still computes the same consistent event length! Do not just rely on this
assertion, in case test coverage is not 100%.
*/
DBUG_ASSERT(DBUG_IF("negate_xid_from_gtid") ||
DBUG_IF("negate_xid_data_from_gtid") ||
DBUG_IF("negate_alter_fl_from_gtid") ||
DBUG_IF("inject_fl_extra_multi_engine_into_gtid") ||
write_len + LOG_EVENT_HEADER_LEN == get_size());
return write_header(writer, write_len) ||
write_data(writer, buf, write_len) ||
write_footer(writer);