diff --git a/mysql-test/suite/galera/r/galera_bf_kill_debug.result b/mysql-test/suite/galera/r/galera_bf_kill_debug.result deleted file mode 100644 index c3eae243f47..00000000000 --- a/mysql-test/suite/galera/r/galera_bf_kill_debug.result +++ /dev/null @@ -1,54 +0,0 @@ -connection node_2; -connection node_1; -connection node_2; -CREATE TABLE t1(a int not null primary key auto_increment,b int) engine=InnoDB; -insert into t1 values (NULL,1); -connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; -connection node_2a; -truncate t1; -insert into t1 values (1,0); -begin; -update t1 set b=2 where a=1; -connection node_2; -set session wsrep_sync_wait=0; -connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2; -connection node_2b; -SET GLOBAL debug_dbug = "d,sync.before_wsrep_thd_abort"; -connection node_1; -select * from t1; -a b -1 0 -update t1 set b= 1 where a=1; -connection node_2b; -SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.before_wsrep_thd_abort_reached"; -connection node_2; -SET DEBUG_SYNC= 'before_awake_no_mutex SIGNAL awake_reached WAIT_FOR continue_kill'; -connection node_2b; -SET DEBUG_SYNC='now WAIT_FOR awake_reached'; -SET GLOBAL debug_dbug = ""; -SET DEBUG_SYNC = "now SIGNAL signal.before_wsrep_thd_abort"; -SET DEBUG_SYNC = "now SIGNAL continue_kill"; -connection node_2; -connection node_2a; -select * from t1; -connection node_2; -SET DEBUG_SYNC = "RESET"; -drop table t1; -disconnect node_2a; -connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; -connection node_2a; -CREATE TABLE t1 (i int primary key); -SET DEBUG_SYNC = "before_wsrep_ordered_commit SIGNAL bwoc_reached WAIT_FOR bwoc_continue"; -INSERT INTO t1 VALUES (1); -connection node_2; -SET DEBUG_SYNC = "now WAIT_FOR bwoc_reached"; -SET DEBUG_SYNC = "now SIGNAL bwoc_continue"; -SET DEBUG_SYNC='RESET'; -connection node_2a; -connection node_2; -select * from t1; -i -1 -disconnect node_2a; -connection node_1; -drop table t1; diff --git a/mysql-test/suite/galera/t/galera_bf_kill_debug.test b/mysql-test/suite/galera/t/galera_bf_kill_debug.test index b687a5a6a67..b4c8584d449 100644 --- a/mysql-test/suite/galera/t/galera_bf_kill_debug.test +++ b/mysql-test/suite/galera/t/galera_bf_kill_debug.test @@ -93,8 +93,9 @@ SET DEBUG_SYNC = "RESET"; drop table t1; --disconnect node_2a +--disconnect node_2b # -# Test case 7: +# Test case 8: # run a transaction in node 2, and set a sync point to pause the transaction # in commit phase. # Through another connection to node 2, kill the committing transaction by @@ -138,3 +139,100 @@ select * from t1; --connection node_1 drop table t1; + +# +# Test case 9: +# 1. Start a transaction on node_2, +# and leave it pending while holding a row locked +# 2. set sync point pause applier +# 3. send a conflicting write on node_1, it will pause +# at the sync point +# 4. though another connection to node_2, kill the local +# transaction +# +--connection node_2 +CREATE TABLE t1(a int not null primary key auto_increment,b int) engine=InnoDB; + +# +# connection node_2a runs a local transaction, that is victim of BF abort +# and victim of KILL command by connection node_2 +# +--connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 +--connection node_2a +insert into t1 values (1,0); + +# start a victim transaction that will conflict with later applier +begin; +update t1 set b=2 where a=1; + +# +# Make sure update has started +# +--connection node_2 +set session wsrep_sync_wait=0; +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'root' AND COMMAND = 'Sleep' LIMIT 1 +--source include/wait_condition.inc + +# +# Get thread ID for update transaction +# +--let $k_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'root' AND COMMAND = 'Sleep' LIMIT 1` + +# connection node_2b is for controlling debug syn points +# first set a sync point for applier, to pause during BF aborting +# and before THD::awake would be called +# +--connect node_2b, 127.0.0.1, root, , test, $NODE_MYPORT_2 +--connection node_2b +SET GLOBAL debug_dbug = "d,sync.wsrep_innobase_kill_one_trx_before_LOCK_thd_data"; +--connection node_2 + +# +# replicate an update, which will BF abort the victim node_2a +# however, while applier in node 2 is handling the abort, +# it will pause in sync point set by node_2b +# +--connection node_1 +select * from t1; +update t1 set b= 1 where a=1; + +# +# wait until the applying of above update has reached the sync point +# in node 2 +# +--connection node_2b +SET SESSION DEBUG_SYNC = "now WAIT_FOR sync.wsrep_innobase_kill_one_trx_before_LOCK_thd_data"; + +--connection node_2 +# +# pause KILL execution before awake +# +SET DEBUG_SYNC= 'before_awake_no_mutex SIGNAL awake_reached WAIT_FOR continue_kill'; +--disable_query_log +--send_eval KILL $k_thread +--enable_query_log + +--connection node_2b +SET DEBUG_SYNC='now WAIT_FOR awake_reached'; + +--echo # release KILL operator +SET GLOBAL debug_dbug = ""; +SET DEBUG_SYNC = "now SIGNAL continue_kill"; + +--echo # Release applier +SET DEBUG_SYNC = "now SIGNAL signal.wsrep_innobase_kill_one_trx_before_LOCK_thd_data"; + +--connection node_2 +--reap + +--connection node_2a +--error 0,1213 +--reap + +--connection node_2 +SET DEBUG_SYNC = "RESET"; + +drop table t1; + +--disconnect node_2a +--disconnect node_2b diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 9678c466cb4..56fc586ea7e 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -18668,6 +18668,16 @@ wsrep_innobase_kill_one_trx( trx_t* bf_trx= thd_to_trx(bf_thd); DBUG_ASSERT(wsrep_on(bf_thd)); + DBUG_EXECUTE_IF("sync.wsrep_innobase_kill_one_trx_before_LOCK_thd_data", + { + const char act[]= + "now " + "SIGNAL sync.wsrep_innobase_kill_one_trx_before_LOCK_thd_data " + "WAIT_FOR signal.wsrep_innobase_kill_one_trx_before_LOCK_thd_data"; + DBUG_ASSERT(!debug_sync_set_action(bf_thd, + STRING_WITH_LEN(act))); + };); + wsrep_thd_LOCK(thd); WSREP_LOG_CONFLICT(bf_thd, thd, TRUE);