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-29676 Add query to set lock wait timeout when getting sts crd

Browse Source 
Set the lock wait timeout to 1 beforehand, and reset it afterwards, to
avoid lock conflict caused by opening the same table twice in case of
self-reference.
This commit is contained in:
Yuchen Pei
2023-04-27 09:51:34 +10:00
parent 779307dd5b
commit 6abafdbb7c
9 changed files with 188 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
storage/spider/spd_db_mysql.cc
View File

@@ -13443,6 +13443,56 @@ int spider_mbase_handler::sts_mode_exchange(
DBUG_RETURN(sts_mode);
}
/** Set the session lock wait time out */
int spider_db_mbase::set_lock_wait_timeout(uint timeout)
{
String query(0);
int error_num;
DBUG_ENTER("spider_db_set_lock_wait_timeout");
query.append(STRING_WITH_LEN(
"set @old_lock_wait_timeout=@@session.lock_wait_timeout;"
"set session lock_wait_timeout="));
query.append_ulonglong(timeout);
query.append(STRING_WITH_LEN(";"));
if ((error_num = exec_query(query.c_ptr(), query.length(), -1)))
DBUG_RETURN(error_num);
spider_db_result *result;
do {
st_spider_db_request_key request_key= {1, 1, NULL, 1, NULL};
if ((result = conn->db_conn->store_result(NULL, &request_key,
&error_num)))
{
result->free_result();
delete result;
} else if ((error_num = conn->db_conn->get_errno()))
break;
} while (!(error_num = conn->db_conn->next_result()));
DBUG_RETURN(0);
}
/** Reset the session lock wait time out */
int spider_db_mbase::reset_lock_wait_timeout()
{
const LEX_CSTRING query = {STRING_WITH_LEN(
"set session lock_wait_timeout=@old_lock_wait_timeout;")};
int error_num;
DBUG_ENTER("spider_db_set_lock_wait_timeout");
if ((error_num = exec_query(query.str, query.length, -1)))
DBUG_RETURN(error_num);
spider_db_result *result;
do {
st_spider_db_request_key request_key= {1, 1, NULL, 1, NULL};
if ((result = conn->db_conn->store_result(NULL, &request_key,
&error_num)))
{
result->free_result();
delete result;
} else if ((error_num = conn->db_conn->get_errno()))
break;
} while (!(error_num= conn->db_conn->next_result()));
DBUG_RETURN(0);
}
/** FIXME: refactor more functions to use spider_setup_for_query() and
spider_teardown_after_query(). */
void spider_setup_for_query(ha_spider *spider, SPIDER_CONN *conn, int link_idx)
@@ -13494,6 +13544,8 @@ int spider_mbase_handler::show_table_status(
spider_conn_set_timeout_from_share(
conn, link_idx, spider->wide_handler->trx->thd, share);
if ((error_num = spider_db_set_names(spider, conn, link_idx)) ||
(error_num =
((spider_db_mbase *) conn->db_conn)->set_lock_wait_timeout(1)) ||
/* Executes the `show table status` query */
(spider_db_query(
conn,
@@ -13514,6 +13566,9 @@ int spider_mbase_handler::show_table_status(
spider_conn_set_timeout_from_share(conn, link_idx,
spider->wide_handler->trx->thd,
share);
if ((error_num =
((spider_db_mbase *) conn->db_conn)->set_lock_wait_timeout(1)))
DBUG_RETURN(spider_teardown_after_query(conn, error_num, true));
if (spider_db_query(
conn,
mysql_share->show_table_status[pos].ptr(),
@@ -13590,8 +13645,21 @@ int spider_mbase_handler::show_table_status(
}
if ((error_num = ((spider_db_mbase *) conn->db_conn)->fetch_and_print_warnings(NULL)))
{
((spider_db_mbase *) conn->db_conn)->reset_lock_wait_timeout();
if (error_num == ER_LOCK_WAIT_TIMEOUT)
{
error_num = ER_SPIDER_TABLE_OPEN_LOCK_WAIT_TIMEOUT_NUM;
my_printf_error(
ER_SPIDER_TABLE_OPEN_LOCK_WAIT_TIMEOUT_NUM,
ER_SPIDER_TABLE_OPEN_LOCK_WAIT_TIMEOUT_STR, MYF(0),
mysql_share->db_names_str[spider->conn_link_idx[link_idx]].ptr(),
mysql_share->table_names_str[spider->conn_link_idx[link_idx]].ptr());
}
DBUG_RETURN(error_num);
}
if ((error_num =
((spider_db_mbase *) conn->db_conn)->reset_lock_wait_timeout()))
DBUG_RETURN(error_num);
if (share->static_records_for_status != -1)
share->stat.records = (ha_rows) share->static_records_for_status;
if (share->static_mean_rec_length != -1)
@@ -13632,6 +13700,8 @@ int spider_mbase_handler::show_index(
spider_conn_set_timeout_from_share(conn, link_idx,
spider->wide_handler->trx->thd, share);
if ((error_num = spider_db_set_names(spider, conn, link_idx)) ||
(error_num =
((spider_db_mbase *) conn->db_conn)->set_lock_wait_timeout(1)) ||
(spider_db_query(
conn,
mysql_share->show_index[pos].ptr(),
@@ -13651,6 +13721,9 @@ int spider_mbase_handler::show_index(
spider_conn_set_timeout_from_share(conn, link_idx,
spider->wide_handler->trx->thd,
share);
if ((error_num =
((spider_db_mbase *) conn->db_conn)->set_lock_wait_timeout(1)))
DBUG_RETURN(spider_teardown_after_query(conn, error_num, true));
if (spider_db_query(
conn,
mysql_share->show_index[pos].ptr(),
@@ -13711,6 +13784,10 @@ int spider_mbase_handler::show_index(
default:
break;
}
if (!error_num)
error_num = ((spider_db_mbase *) conn->db_conn)->reset_lock_wait_timeout();
else
((spider_db_mbase *) conn->db_conn)->reset_lock_wait_timeout();
DBUG_RETURN(error_num);
}