Skip to content
Permalink
Browse files

Further cleanup and add proper configuration to tests.

  • Loading branch information
janlindstrom committed Jan 15, 2020
1 parent ce2de25 commit dcadc8bc7ff66a865bc0cb698d0f04b5967fdfb4
@@ -10,7 +10,6 @@
#
##############################################################################

MW-286 : MDEV-18464 Killing thread can cause mutex deadlock if done concurrently with Galera/replication victim kill
MW-329 : MDEV-19962 Galera test failure on MW-329
MW-388: MDEV-19803 Long semaphore wait error on galera.MW-388
galera_account_management : MariaDB 10.0 does not support ALTER USER
@@ -0,0 +1,10 @@
!include ../galera_2nodes.cnf

[mysqld.1]
wsrep-debug=ON
wsrep-log-conflicts=ON

[mysqld.2]
wsrep-debug=ON
wsrep-log-conflicts=ON

@@ -3,8 +3,6 @@
#

--source include/galera_cluster.inc
--source include/have_innodb.inc
--source include/big_test.inc

--connection node_1
CREATE TABLE ten (f1 INTEGER) Engine=InnoDB;
@@ -0,0 +1,10 @@
!include ../galera_2nodes.cnf

[mysqld.1]
wsrep-debug=ON
wsrep-log-conflicts=ON

[mysqld.2]
wsrep-debug=ON
wsrep-log-conflicts=ON

@@ -0,0 +1,10 @@
!include ../galera_2nodes.cnf

[mysqld.1]
wsrep-debug=ON
wsrep-log-conflicts=ON

[mysqld.2]
wsrep-debug=ON
wsrep-log-conflicts=ON

@@ -480,6 +480,8 @@ static int wsrep_kill(wsrep_kill_t* item)

wsrep_thd_LOCK(thd);

WSREP_LOG_CONFLICT(bf_thd, thd, TRUE);

WSREP_DEBUG("Aborter %s trx_id: %lu thread: %ld "
"seqno: %lld query_state: %s conflict_state: %s query: %s",
wsrep_thd_is_BF(bf_thd, false) ? "BF" : "normal",
@@ -4,7 +4,7 @@ Copyright (c) 2000, 2019, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, 2009 Google Inc.
Copyright (c) 2009, Percona Inc.
Copyright (c) 2012, Facebook Inc.
Copyright (c) 2013, 2019, MariaDB Corporation.
Copyright (c) 2013, 2020, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described
DBUG_RETURN(1);
}

WSREP_LOG_CONFLICT(bf_thd, thd, TRUE);

/* Actual processing of the victim kill is handled later
on background thread. At this point we may not hold
LOCK_thd_data mutex as we are already holding lock sys

0 comments on commit dcadc8b

Please sign in to comment.
You can’t perform that action at this time.