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

MDEV-22051: Protocol::end_statement(): Assertion `0' failed on Galera node upon DDL attempt with conflicting lock

Browse Source 
If FTWRL is issued, DDL statements should report error back to user before
TOI is started.
This commit is contained in:
mkaruza 2020-03-31 18:43:10 +02:00 committed by Jan Lindström
parent 476966b3fb
commit edc3899d97
5 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mysql-test/suite/galera/r/MDEV-22051.result Normal file
View File

@ -0,0 +1,20 @@
connection node_2;
connection node_1;
FLUSH TABLES WITH READ LOCK;
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
ERROR 08S01: Aborting TOI: Global Read-Lock (FTWRL) in place.
SET wsrep_OSU_method=RSU;
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
ERROR 08S01: Aborting TOI: Global Read-Lock (FTWRL) in place.
SET wsrep_OSU_method=TOI;
connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1;
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
ERROR 08S01: Aborting TOI: Global Read-Lock (FTWRL) in place.
connection node_1;
UNLOCK TABLES;
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
FLUSH TABLES WITH READ LOCK;
INSERT INTO t1 VALUES (1);
ERROR HY000: Can't execute the query because you have a conflicting read lock
UNLOCK TABLES;
DROP TABLE t1;

33
mysql-test/suite/galera/t/MDEV-22051.test Normal file
View File

@ -0,0 +1,33 @@
#
# If FTWRL is issued on node, DDL statement should report error back to
# user.
#
--source include/galera_cluster.inc
--source include/have_innodb.inc
FLUSH TABLES WITH READ LOCK;
--error ER_UNKNOWN_COM_ERROR
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
SET wsrep_OSU_method=RSU;
--error ER_UNKNOWN_COM_ERROR
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
SET wsrep_OSU_method=TOI;
--connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
--error ER_UNKNOWN_COM_ERROR
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
--connection node_1
UNLOCK TABLES;
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
FLUSH TABLES WITH READ LOCK;
--error ER_CANT_UPDATE_WITH_READLOCK
INSERT INTO t1 VALUES (1);
UNLOCK TABLES;
DROP TABLE t1;

2
sql/sql_parse.cc
View File

@ -3527,7 +3527,7 @@ mysql_execute_command(THD *thd)
* and dirty reads (if configured)
*/
if (!(thd->wsrep_applier) &&
!(wsrep_ready_get() && wsrep_reject_queries == WSREP_REJECT_NONE) &&
!(wsrep_ready_get() && wsrep_reject_queries == WSREP_REJECT_NONE) &&
!(thd->variables.wsrep_dirty_reads &&
(sql_command_flags[lex->sql_command] & CF_CHANGES_DATA) == 0) &&
!wsrep_tables_accessible_when_detached(all_tables) &&

6
sql/wsrep_mysqld.cc
View File

@ -2028,10 +2028,10 @@ int wsrep_to_isolation_begin(THD *thd, const char *db_, const char *table_,
DBUG_ASSERT(wsrep_thd_is_local(thd));
DBUG_ASSERT(thd->wsrep_trx().ws_meta().seqno().is_undefined());
if (thd->global_read_lock.is_acquired())
if (Wsrep_server_state::instance().desynced_on_pause())
{
WSREP_DEBUG("Aborting TOI: Global Read-Lock (FTWRL) in place: %s %llu",
WSREP_QUERY(thd), thd->thread_id);
my_message(ER_UNKNOWN_COM_ERROR,
"Aborting TOI: Global Read-Lock (FTWRL) in place.", MYF(0));
return -1;
}

2
wsrep-lib

@ -1 +1 @@
Subproject commit a17b65a25f5e608ffa8e6e051930bf47ed95019a
Subproject commit d0255569b0154e23c5461ed13928f9b0a18008e4