mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
f307160218
This commit contains a merge from 10.5-MDEV-29293-squash into 10.6. Although the bug MDEV-29293 was not reproducible with 10.6, the fix contains several improvements for wsrep KILL query and BF abort handling, and addresses the following issues: * MDEV-30307 KILL command issued inside a transaction is problematic for galera replication: This commit will remove KILL TOI replication, so Galera side transaction context is not lost during KILL. * MDEV-21075 KILL QUERY maintains nodes data consistency but breaks GTID sequence: This is fixed as well as KILL does not use TOI, and thus does not change GTID state. * MDEV-30372 Assertion in wsrep-lib state: This was caused by BF abort or KILL when local transaction was in the middle of group commit. This commit disables THD::killed handling during commit, so the problem is avoided. * MDEV-30963 Assertion failure !lock.was_chosen_as_deadlock_victim in trx0trx.h:1065: The assertion happened when the victim was BF aborted via MDL while it was committing. This commit changes MDL BF aborts so that transactions which are committing cannot be BF aborted via MDL. The RQG grammar attached in the issue could not reproduce the crash anymore. Original commit message from 10.5 fix: MDEV-29293 MariaDB stuck on starting commit state The problem seems to be a deadlock between KILL command execution and BF abort issued by an applier, where: * KILL has locked victim's LOCK_thd_kill and LOCK_thd_data. * Applier has innodb side global lock mutex and victim trx mutex. * KILL is calling innobase_kill_query, and is blocked by innodb global lock mutex. * Applier is in wsrep_innobase_kill_one_trx and is blocked by victim's LOCK_thd_kill. The fix in this commit removes the TOI replication of KILL command and makes KILL execution less intrusive operation. Aborting the victim happens now by using awake_no_mutex() and ha_abort_transaction(). If the KILL happens when the transaction is committing, the KILL operation is postponed to happen after the statement has completed in order to avoid KILL to interrupt commit processing. Notable changes in this commit: * wsrep client connections's error state may remain sticky after client connection is closed. This error message will then pop up for the next client session issuing first SQL statement. This problem raised with test galera.galera_bf_kill. The fix is to reset wsrep client error state, before a THD is reused for next connetion. * Release THD locks in wsrep_abort_transaction when locking innodb mutexes. This guarantees same locking order as with applier BF aborting. * BF abort from MDL was changed to do BF abort on server/wsrep-lib side first, and only then do the BF abort on InnoDB side. This removes the need to call back from InnoDB for BF aborts which originate from MDL and simplifies the locking. * Removed wsrep_thd_set_wsrep_aborter() from service_wsrep.h. The manipulation of the wsrep_aborter can be done solely on server side. Moreover, it is now debug only variable and could be excluded from optimized builds. * Remove LOCK_thd_kill from wsrep_thd_LOCK/UNLOCK to allow more fine grained locking for SR BF abort which may require locking of victim LOCK_thd_kill. Added explicit call for wsrep_thd_kill_LOCK/UNLOCK where appropriate. * Wsrep-lib was updated to version which allows external locking for BF abort calls. Changes to MTR tests: * Disable galera_bf_abort_group_commit. This test is going to be removed (MDEV-30855). * Make galera_var_retry_autocommit result more readable by echoing cases and expectations into result. Only one expected result for reap to verify that server returns expected status for query. * Record galera_gcache_recover_manytrx as result file was incomplete. Trivial change. * Make galera_create_table_as_select more deterministic: Wait until CTAS execution has reached MDL wait for multi-master conflict case. Expected error from multi-master conflict is ER_QUERY_INTERRUPTED. This is because CTAS does not yet have open wsrep transaction when it is waiting for MDL, query gets interrupted instead of BF aborted. This should be addressed in separate task. * A new test galera_bf_abort_registering to check that registering trx gets BF aborted through MDL. * A new test galera_kill_group_commit to verify correct behavior when KILL is executed while the transaction is committing. Co-authored-by: Seppo Jaakola <seppo.jaakola@iki.fi> Co-authored-by: Jan Lindström <jan.lindstrom@galeracluster.com> Signed-off-by: Julius Goryavsky <julius.goryavsky@mariadb.com>
257 lines
14 KiB
C
257 lines
14 KiB
C
#ifndef MYSQL_SERVICE_WSREP_INCLUDED
|
|
#define MYSQL_SERVICE_WSREP_INCLUDED
|
|
|
|
enum Wsrep_service_key_type
|
|
{
|
|
WSREP_SERVICE_KEY_SHARED,
|
|
WSREP_SERVICE_KEY_REFERENCE,
|
|
WSREP_SERVICE_KEY_UPDATE,
|
|
WSREP_SERVICE_KEY_EXCLUSIVE
|
|
};
|
|
|
|
#if (defined (MYSQL_DYNAMIC_PLUGIN) && defined(MYSQL_SERVICE_WSREP_DYNAMIC_INCLUDED)) || (!defined(MYSQL_DYNAMIC_PLUGIN) && defined(MYSQL_SERVICE_WSREP_STATIC_INCLUDED))
|
|
|
|
#else
|
|
|
|
/* Copyright (c) 2015, 2020, MariaDB Corporation Ab
|
|
2018 Codership Oy <info@codership.com>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
|
|
|
|
/**
|
|
@file
|
|
wsrep service
|
|
|
|
Interface to WSREP functionality in the server.
|
|
For engines that want to support galera.
|
|
*/
|
|
#include <my_pthread.h>
|
|
#ifdef __cplusplus
|
|
#endif
|
|
|
|
struct xid_t;
|
|
struct wsrep_ws_handle;
|
|
struct wsrep_buf;
|
|
|
|
/* Must match to definition in sql/mysqld.h */
|
|
typedef int64 query_id_t;
|
|
|
|
|
|
extern struct wsrep_service_st {
|
|
my_bool (*get_wsrep_recovery_func)();
|
|
bool (*wsrep_consistency_check_func)(MYSQL_THD thd);
|
|
int (*wsrep_is_wsrep_xid_func)(const void *xid);
|
|
long long (*wsrep_xid_seqno_func)(const struct xid_t *xid);
|
|
const unsigned char* (*wsrep_xid_uuid_func)(const struct xid_t *xid);
|
|
my_bool (*wsrep_on_func)(const MYSQL_THD thd);
|
|
bool (*wsrep_prepare_key_for_innodb_func)(MYSQL_THD thd, const unsigned char*, size_t, const unsigned char*, size_t, struct wsrep_buf*, size_t*);
|
|
void (*wsrep_thd_LOCK_func)(const MYSQL_THD thd);
|
|
int (*wsrep_thd_TRYLOCK_func)(const MYSQL_THD thd);
|
|
void (*wsrep_thd_UNLOCK_func)(const MYSQL_THD thd);
|
|
const char * (*wsrep_thd_query_func)(const MYSQL_THD thd);
|
|
int (*wsrep_thd_retry_counter_func)(const MYSQL_THD thd);
|
|
bool (*wsrep_thd_ignore_table_func)(MYSQL_THD thd);
|
|
long long (*wsrep_thd_trx_seqno_func)(const MYSQL_THD thd);
|
|
my_bool (*wsrep_thd_is_aborting_func)(const MYSQL_THD thd);
|
|
void (*wsrep_set_data_home_dir_func)(const char *data_dir);
|
|
my_bool (*wsrep_thd_is_BF_func)(const MYSQL_THD thd, my_bool sync);
|
|
my_bool (*wsrep_thd_is_local_func)(const MYSQL_THD thd);
|
|
void (*wsrep_thd_self_abort_func)(MYSQL_THD thd);
|
|
int (*wsrep_thd_append_key_func)(MYSQL_THD thd, const struct wsrep_key* key,
|
|
int n_keys, enum Wsrep_service_key_type);
|
|
int (*wsrep_thd_append_table_key_func)(MYSQL_THD thd, const char* db,
|
|
const char* table, enum Wsrep_service_key_type);
|
|
my_bool (*wsrep_thd_is_local_transaction)(const MYSQL_THD thd);
|
|
const char* (*wsrep_thd_client_state_str_func)(const MYSQL_THD thd);
|
|
const char* (*wsrep_thd_client_mode_str_func)(const MYSQL_THD thd);
|
|
const char* (*wsrep_thd_transaction_state_str_func)(const MYSQL_THD thd);
|
|
query_id_t (*wsrep_thd_transaction_id_func)(const MYSQL_THD thd);
|
|
my_bool (*wsrep_thd_bf_abort_func)(MYSQL_THD bf_thd,
|
|
MYSQL_THD victim_thd,
|
|
my_bool signal);
|
|
my_bool (*wsrep_thd_order_before_func)(const MYSQL_THD left, const MYSQL_THD right);
|
|
void (*wsrep_handle_SR_rollback_func)(MYSQL_THD BF_thd, MYSQL_THD victim_thd);
|
|
my_bool (*wsrep_thd_skip_locking_func)(const MYSQL_THD thd);
|
|
const char* (*wsrep_get_sr_table_name_func)();
|
|
my_bool (*wsrep_get_debug_func)();
|
|
void (*wsrep_commit_ordered_func)(MYSQL_THD thd);
|
|
my_bool (*wsrep_thd_is_applying_func)(const MYSQL_THD thd);
|
|
ulong (*wsrep_OSU_method_get_func)(const MYSQL_THD thd);
|
|
my_bool (*wsrep_thd_has_ignored_error_func)(const MYSQL_THD thd);
|
|
void (*wsrep_thd_set_ignored_error_func)(MYSQL_THD thd, my_bool val);
|
|
void (*wsrep_report_bf_lock_wait_func)(const MYSQL_THD thd,
|
|
unsigned long long trx_id);
|
|
void (*wsrep_thd_kill_LOCK_func)(const MYSQL_THD thd);
|
|
void (*wsrep_thd_kill_UNLOCK_func)(const MYSQL_THD thd);
|
|
void (*wsrep_thd_set_wsrep_PA_unsafe_func)(MYSQL_THD thd);
|
|
} *wsrep_service;
|
|
|
|
#define MYSQL_SERVICE_WSREP_INCLUDED
|
|
#endif
|
|
|
|
#ifdef MYSQL_DYNAMIC_PLUGIN
|
|
|
|
#define MYSQL_SERVICE_WSREP_DYNAMIC_INCLUDED
|
|
#define get_wsrep_recovery() wsrep_service->get_wsrep_recovery_func()
|
|
#define wsrep_consistency_check(T) wsrep_service->wsrep_consistency_check_func(T)
|
|
#define wsrep_is_wsrep_xid(X) wsrep_service->wsrep_is_wsrep_xid_func(X)
|
|
#define wsrep_xid_seqno(X) wsrep_service->wsrep_xid_seqno_func(X)
|
|
#define wsrep_xid_uuid(X) wsrep_service->wsrep_xid_uuid_func(X)
|
|
#define wsrep_on(thd) (thd) && WSREP_ON && wsrep_service->wsrep_on_func(thd)
|
|
#define wsrep_prepare_key_for_innodb(A,B,C,D,E,F,G) wsrep_service->wsrep_prepare_key_for_innodb_func(A,B,C,D,E,F,G)
|
|
#define wsrep_thd_LOCK(T) wsrep_service->wsrep_thd_LOCK_func(T)
|
|
#define wsrep_thd_TRYLOCK(T) wsrep_service->wsrep_thd_TRYLOCK_func(T)
|
|
#define wsrep_thd_UNLOCK(T) wsrep_service->wsrep_thd_UNLOCK_func(T)
|
|
#define wsrep_thd_kill_LOCK(T) wsrep_service->wsrep_thd_kill_LOCK_func(T)
|
|
#define wsrep_thd_kill_UNLOCK(T) wsrep_service->wsrep_thd_kill_UNLOCK_func(T)
|
|
#define wsrep_thd_query(T) wsrep_service->wsrep_thd_query_func(T)
|
|
#define wsrep_thd_retry_counter(T) wsrep_service->wsrep_thd_retry_counter_func(T)
|
|
#define wsrep_thd_ignore_table(T) wsrep_service->wsrep_thd_ignore_table_func(T)
|
|
#define wsrep_thd_trx_seqno(T) wsrep_service->wsrep_thd_trx_seqno_func(T)
|
|
#define wsrep_set_data_home_dir(A) wsrep_service->wsrep_set_data_home_dir_func(A)
|
|
#define wsrep_thd_is_BF(T,S) wsrep_service->wsrep_thd_is_BF_func(T,S)
|
|
#define wsrep_thd_is_aborting(T) wsrep_service->wsrep_thd_is_aborting_func(T)
|
|
#define wsrep_thd_is_local(T) wsrep_service->wsrep_thd_is_local_func(T)
|
|
#define wsrep_thd_self_abort(T) wsrep_service->wsrep_thd_self_abort_func(T)
|
|
#define wsrep_thd_append_key(T,W,N,K) wsrep_service->wsrep_thd_append_key_func(T,W,N,K)
|
|
#define wsrep_thd_append_table_key(T,D,B,K) wsrep_service->wsrep_thd_append_table_key_func(T,D,B,K)
|
|
#define wsrep_thd_is_local_transaction(T) wsrep_service->wsrep_thd_is_local_transaction_func(T)
|
|
#define wsrep_thd_client_state_str(T) wsrep_service->wsrep_thd_client_state_str_func(T)
|
|
#define wsrep_thd_client_mode_str(T) wsrep_service->wsrep_thd_client_mode_str_func(T)
|
|
#define wsrep_thd_transaction_state_str(T) wsrep_service->wsrep_thd_transaction_state_str_func(T)
|
|
#define wsrep_thd_transaction_id(T) wsrep_service->wsrep_thd_transaction_id_func(T)
|
|
#define wsrep_thd_bf_abort(T,T2,S) wsrep_service->wsrep_thd_bf_abort_func(T,T2,S)
|
|
#define wsrep_thd_order_before(L,R) wsrep_service->wsrep_thd_order_before_func(L,R)
|
|
#define wsrep_handle_SR_rollback(B,V) wsrep_service->wsrep_handle_SR_rollback_func(B,V)
|
|
#define wsrep_thd_skip_locking(T) wsrep_service->wsrep_thd_skip_locking_func(T)
|
|
#define wsrep_get_sr_table_name() wsrep_service->wsrep_get_sr_table_name_func()
|
|
#define wsrep_get_debug() wsrep_service->wsrep_get_debug_func()
|
|
#define wsrep_commit_ordered(T) wsrep_service->wsrep_commit_ordered_func(T)
|
|
#define wsrep_thd_is_applying(T) wsrep_service->wsrep_thd_is_applying_func(T)
|
|
#define wsrep_OSU_method_get(T) wsrep_service->wsrep_OSU_method_get_func(T)
|
|
#define wsrep_thd_has_ignored_error(T) wsrep_service->wsrep_thd_has_ignored_error_func(T)
|
|
#define wsrep_thd_set_ignored_error(T,V) wsrep_service->wsrep_thd_set_ignored_error_func(T,V)
|
|
#define wsrep_report_bf_lock_wait(T,I) wsrep_service->wsrep_report_bf_lock_wait(T,I)
|
|
#define wsrep_thd_set_PA_unsafe(T) wsrep_service->wsrep_thd_set_PA_unsafe_func(T)
|
|
#else
|
|
|
|
#define MYSQL_SERVICE_WSREP_STATIC_INCLUDED
|
|
extern ulong wsrep_debug;
|
|
extern my_bool wsrep_log_conflicts;
|
|
extern my_bool wsrep_certify_nonPK;
|
|
extern my_bool wsrep_load_data_splitting;
|
|
extern my_bool wsrep_drupal_282555_workaround;
|
|
extern my_bool wsrep_recovery;
|
|
extern long wsrep_protocol_version;
|
|
|
|
extern "C" bool wsrep_consistency_check(MYSQL_THD thd);
|
|
bool wsrep_prepare_key_for_innodb(MYSQL_THD thd, const unsigned char* cache_key, size_t cache_key_len, const unsigned char* row_id, size_t row_id_len, struct wsrep_buf* key, size_t* key_len);
|
|
extern "C" const char *wsrep_thd_query(const MYSQL_THD thd);
|
|
extern "C" int wsrep_is_wsrep_xid(const void* xid);
|
|
extern "C" long long wsrep_xid_seqno(const struct xid_t* xid);
|
|
const unsigned char* wsrep_xid_uuid(const struct xid_t* xid);
|
|
extern "C" long long wsrep_thd_trx_seqno(const MYSQL_THD thd);
|
|
my_bool get_wsrep_recovery();
|
|
bool wsrep_thd_ignore_table(MYSQL_THD thd);
|
|
void wsrep_set_data_home_dir(const char *data_dir);
|
|
|
|
/* from mysql wsrep-lib */
|
|
#include "my_global.h"
|
|
#include "my_pthread.h"
|
|
|
|
/* Return true if wsrep is enabled for a thd. This means that
|
|
wsrep is enabled globally and the thd has wsrep on */
|
|
extern "C" my_bool wsrep_on(const MYSQL_THD thd);
|
|
/* Lock thd wsrep lock */
|
|
extern "C" void wsrep_thd_LOCK(const MYSQL_THD thd);
|
|
/* Try thd wsrep lock. Return non-zero if lock could not be taken. */
|
|
extern "C" int wsrep_thd_TRYLOCK(const MYSQL_THD thd);
|
|
/* Unlock thd wsrep lock */
|
|
extern "C" void wsrep_thd_UNLOCK(const MYSQL_THD thd);
|
|
|
|
extern "C" void wsrep_thd_kill_LOCK(const MYSQL_THD thd);
|
|
extern "C" void wsrep_thd_kill_UNLOCK(const MYSQL_THD thd);
|
|
|
|
/* Return thd client state string */
|
|
extern "C" const char* wsrep_thd_client_state_str(const MYSQL_THD thd);
|
|
/* Return thd client mode string */
|
|
extern "C" const char* wsrep_thd_client_mode_str(const MYSQL_THD thd);
|
|
/* Return thd transaction state string */
|
|
extern "C" const char* wsrep_thd_transaction_state_str(const MYSQL_THD thd);
|
|
|
|
/* Return current transaction id */
|
|
extern "C" query_id_t wsrep_thd_transaction_id(const MYSQL_THD thd);
|
|
/* Mark thd own transaction as aborted */
|
|
extern "C" void wsrep_thd_self_abort(MYSQL_THD thd);
|
|
/* Return true if thd is in replicating mode */
|
|
extern "C" my_bool wsrep_thd_is_local(const MYSQL_THD thd);
|
|
/* Return true if thd is in high priority mode */
|
|
/* todo: rename to is_high_priority() */
|
|
extern "C" my_bool wsrep_thd_is_applying(const MYSQL_THD thd);
|
|
/* Return true if thd is in TOI mode */
|
|
extern "C" my_bool wsrep_thd_is_toi(const MYSQL_THD thd);
|
|
/* Return true if thd is in replicating TOI mode */
|
|
extern "C" my_bool wsrep_thd_is_local_toi(const MYSQL_THD thd);
|
|
/* Return true if thd is in RSU mode */
|
|
extern "C" my_bool wsrep_thd_is_in_rsu(const MYSQL_THD thd);
|
|
/* Return true if thd is in BF mode, either high_priority or TOI */
|
|
extern "C" my_bool wsrep_thd_is_BF(const MYSQL_THD thd, my_bool sync);
|
|
/* Return true if thd is streaming */
|
|
extern "C" my_bool wsrep_thd_is_SR(const MYSQL_THD thd);
|
|
extern "C" void wsrep_handle_SR_rollback(MYSQL_THD BF_thd, MYSQL_THD victim_thd);
|
|
/* Return thd retry counter */
|
|
extern "C" int wsrep_thd_retry_counter(const MYSQL_THD thd);
|
|
/* BF abort victim_thd */
|
|
extern "C" my_bool wsrep_thd_bf_abort(MYSQL_THD bf_thd,
|
|
MYSQL_THD victim_thd,
|
|
my_bool signal);
|
|
/* Return true if left thd is ordered before right thd */
|
|
extern "C" my_bool wsrep_thd_order_before(const MYSQL_THD left, const MYSQL_THD right);
|
|
/* Return true if thd should skip locking. This means that the thd
|
|
is operating on shared resource inside commit order critical section. */
|
|
extern "C" my_bool wsrep_thd_skip_locking(const MYSQL_THD thd);
|
|
/* Return true if thd is aborting */
|
|
extern "C" my_bool wsrep_thd_is_aborting(const MYSQL_THD thd);
|
|
|
|
struct wsrep_key;
|
|
struct wsrep_key_array;
|
|
extern "C" int wsrep_thd_append_key(MYSQL_THD thd,
|
|
const struct wsrep_key* key,
|
|
int n_keys,
|
|
enum Wsrep_service_key_type);
|
|
|
|
extern "C" int wsrep_thd_append_table_key(MYSQL_THD thd,
|
|
const char* db,
|
|
const char* table,
|
|
enum Wsrep_service_key_type);
|
|
|
|
extern "C" my_bool wsrep_thd_is_local_transaction(const MYSQL_THD thd);
|
|
|
|
extern const char* wsrep_sr_table_name_full;
|
|
|
|
extern "C" const char* wsrep_get_sr_table_name();
|
|
|
|
extern "C" my_bool wsrep_get_debug();
|
|
|
|
extern "C" void wsrep_commit_ordered(MYSQL_THD thd);
|
|
extern "C" my_bool wsrep_thd_is_applying(const MYSQL_THD thd);
|
|
extern "C" ulong wsrep_OSU_method_get(const MYSQL_THD thd);
|
|
extern "C" my_bool wsrep_thd_has_ignored_error(const MYSQL_THD thd);
|
|
extern "C" void wsrep_thd_set_ignored_error(MYSQL_THD thd, my_bool val);
|
|
extern "C" void wsrep_report_bf_lock_wait(const THD *thd,
|
|
unsigned long long trx_id);
|
|
/* declare parallel applying unsafety for the THD */
|
|
extern "C" void wsrep_thd_set_PA_unsafe(MYSQL_THD thd);
|
|
#endif
|
|
#endif /* MYSQL_SERVICE_WSREP_INCLUDED */
|